diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp
index 7fac9c7d5..36c9a1a15 100644
--- a/src/shared/Util.cpp
+++ b/src/shared/Util.cpp
@@ -297,7 +297,8 @@ bool Utf8toWStr(const std::string& utf8str, std::wstring& wstr)
         size_t len = utf8::distance(utf8str.c_str(),utf8str.c_str()+utf8str.size());
         wstr.resize(len);
 
-        utf8::utf8to16(utf8str.c_str(),utf8str.c_str()+utf8str.size(),&wstr[0]);
+        if (len)
+            utf8::utf8to16(utf8str.c_str(),utf8str.c_str()+utf8str.size(),&wstr[0]);
     }
     catch(std::exception)
     {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 7f143ae72..7a7041f42 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10107"
+ #define REVISION_NR "10108"
 #endif // __REVISION_NR_H__