diff --git a/jni/NativeFormats/fbreader/src/formats/fb2/FB2UidReader.cpp b/jni/NativeFormats/fbreader/src/formats/fb2/FB2UidReader.cpp
index 9ab538085..6e65e80c0 100644
--- a/jni/NativeFormats/fbreader/src/formats/fb2/FB2UidReader.cpp
+++ b/jni/NativeFormats/fbreader/src/formats/fb2/FB2UidReader.cpp
@@ -61,6 +61,7 @@ void FB2UidReader::endElementHandler(int tag) {
 				myBuffer.erase();
 				myReadState = READ_DOCUMENT_INFO;
 			}
+			break;
 		default:
 			break;
 	}
diff --git a/jni/NativeFormats/fbreader/src/formats/oeb/OEBUidReader.cpp b/jni/NativeFormats/fbreader/src/formats/oeb/OEBUidReader.cpp
index 676ef2254..8d1028026 100644
--- a/jni/NativeFormats/fbreader/src/formats/oeb/OEBUidReader.cpp
+++ b/jni/NativeFormats/fbreader/src/formats/oeb/OEBUidReader.cpp
@@ -21,7 +21,6 @@
 
 #include <ZLStringUtil.h>
 #include <ZLUnicodeUtil.h>
-#include <ZLLogger.h>
 #include <ZLXMLNamespace.h>
 
 #include "OEBUidReader.h"
@@ -119,7 +118,6 @@ bool OEBUidReader::processNamespaces() const {
 bool OEBUidReader::readUids(const ZLFile &file) {
 	myReadState = READ_NONE;
 	if (!readDocument(file)) {
-		ZLLogger::Instance().println("epub", "Failure while reading info from " + file.path());
 		return false;
 	}
 	return true;
diff --git a/jni/NativeFormats/fbreader/src/library/Book.cpp b/jni/NativeFormats/fbreader/src/library/Book.cpp
index 8972f7155..c7e0f8174 100644
--- a/jni/NativeFormats/fbreader/src/library/Book.cpp
+++ b/jni/NativeFormats/fbreader/src/library/Book.cpp
@@ -308,6 +308,9 @@ void Book::addUid(shared_ptr<UID> uid) {
 }
 
 void Book::addUid(const std::string &type, const std::string &id) {
+	if (type == "" || id == "") {
+		return;
+	}
 	addUid(new UID(type, id));
 }
 
diff --git a/jni/NativeFormats/util/AndroidUtil.cpp b/jni/NativeFormats/util/AndroidUtil.cpp
index b16213806..2b50b0460 100644
--- a/jni/NativeFormats/util/AndroidUtil.cpp
+++ b/jni/NativeFormats/util/AndroidUtil.cpp
@@ -180,7 +180,7 @@ bool AndroidUtil::init(JavaVM* jvm) {
 	Method_Book_setEncoding = new VoidMethod(Class_Book, "setEncoding", "(Ljava/lang/String;)");
 	Method_Book_addAuthor = new VoidMethod(Class_Book, "addAuthor", "(Ljava/lang/String;Ljava/lang/String;)");
 	Method_Book_addTag = new VoidMethod(Class_Book, "addTag", "(Lorg/geometerplus/fbreader/book/Tag;)");
-	Method_Book_addTag = new VoidMethod(Class_Book, "addUid", "(Ljava/lang/String;Ljava/lang/String;)");
+	Method_Book_addUid = new VoidMethod(Class_Book, "addUid", "(Ljava/lang/String;Ljava/lang/String;)");
 
 	StaticMethod_Tag_getTag = new StaticObjectMethod(Class_Tag, "getTag", Class_Tag, "(Lorg/geometerplus/fbreader/book/Tag;Ljava/lang/String;)");
 
diff --git a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
index bd950dbe2..11b1dc352 100644
--- a/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
+++ b/src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
@@ -84,7 +84,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 
 		myDatabase.beginTransaction();
 
-		switch (myDatabase.getVersion()) {
+		switch (version) {
 			case 0:
 				createTables();
 			case 1: