diff --git a/jni/NativeFormats/util/AndroidUtil.cpp b/jni/NativeFormats/util/AndroidUtil.cpp
index dfb411fae..38ce92b11 100644
--- a/jni/NativeFormats/util/AndroidUtil.cpp
+++ b/jni/NativeFormats/util/AndroidUtil.cpp
@@ -205,6 +205,9 @@ jobject AndroidUtil::createZLFile(JNIEnv *env, const std::string &path) {
 }
 
 std::string AndroidUtil::fromJavaString(JNIEnv *env, jstring from) {
+	if (from == 0) {
+		return std::string();
+	}
 	const char *data = env->GetStringUTFChars(from, 0);
 	const std::string result(data);
 	env->ReleaseStringUTFChars(from, data);
diff --git a/jni/NativeFormats/zlibrary/core/src/encoding/DummyEncodingConverter.cpp b/jni/NativeFormats/zlibrary/core/src/encoding/DummyEncodingConverter.cpp
index ecfb277cf..6ec401198 100644
--- a/jni/NativeFormats/zlibrary/core/src/encoding/DummyEncodingConverter.cpp
+++ b/jni/NativeFormats/zlibrary/core/src/encoding/DummyEncodingConverter.cpp
@@ -37,7 +37,7 @@ friend class DummyEncodingConverterProvider;
 
 bool DummyEncodingConverterProvider::providesConverter(const std::string &encoding) {
 	const std::string lowerCasedEncoding = ZLUnicodeUtil::toLower(encoding);
-	return (lowerCasedEncoding == "utf-8") || (lowerCasedEncoding == "us-ascii");
+	return lowerCasedEncoding == "utf-8" || lowerCasedEncoding == "us-ascii";
 }
 
 shared_ptr<ZLEncodingConverter> DummyEncodingConverterProvider::createConverter() {