Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/main.cpp

1 files changed, 7 insertions, 2 deletions

diff --git a/src/db.h b/src/db.h
index 38daad3e91..33a6631e35 100644
--- a/src/db.h
+++ b/src/db.h
@@ -73,8 +73,13 @@ protected:
             return false;
 
         // Unserialize value
-        CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK);
-        ssValue >> value;
+        try {
+            CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK);
+            ssValue >> value;
+        }
+        catch (std::exception &e) {
+            return false;
+        }
 
         // Clear and free memory
         memset(datValue.get_data(), 0, datValue.get_size());