diff --git a/src/data/locale.cpp b/src/data/locale.cpp
index b11dc152..0c471f88 100644
--- a/src/data/locale.cpp
+++ b/src/data/locale.cpp
@@ -210,10 +210,13 @@ InputStreamP load_resource_text(const String& name) {
     int len = ::SizeofResource(wxGetInstance(), hResource);
     return shared(new wxMemoryInputStream(data, len));
   #else
-        static String path = wxStandardPaths::Get().GetDataDir() + _("/resource/");
-        static String local_path = wxStandardPaths::Get().GetUserDataDir() + _("/resource/");
-        if (wxFileExists(path + name)) return shared(new wxFileInputStream(path + name));
-        else return shared(new wxFileInputStream(local_path + name));
+    static String path = wxStandardPaths::Get().GetDataDir() + _("/resource/");
+    static String local_path = wxStandardPaths::Get().GetUserDataDir() + _("/resource/");
+    if (wxFileExists(path + name)) {
+      return shared(new wxFileInputStream(path + name));
+    } else {
+      return shared(new wxFileInputStream(local_path + name));
+    }
   #endif
 }
 
diff --git a/src/util/io/reader.cpp b/src/util/io/reader.cpp
index a6520731..04fbd9d3 100644
--- a/src/util/io/reader.cpp
+++ b/src/util/io/reader.cpp
@@ -28,6 +28,7 @@ Reader::Reader(const InputStreamP& input, Packaged* package, const String& filen
   , input(input)
 {
   assert(input);
+  assert(input->IsOk());
   eat_utf8_bom(*input);
   moveNext();
   handleAppVersion();
@@ -403,7 +404,7 @@ template <> void Reader::handle(FileName& f) {
         InputStreamP  in     = Package::openAbsoluteFile(str);
         out->Write(*in); // copy
         f.assign(packaged_name);
-      } catch (Error) {
+      } catch (Error const&) {
         // ignore errors
       }
     } else {