diff --git a/src/com/vividsolutions/jump/I18N.java b/src/com/vividsolutions/jump/I18N.java
index c34b755de..9356545f9 100644
--- a/src/com/vividsolutions/jump/I18N.java
+++ b/src/com/vividsolutions/jump/I18N.java
@@ -196,7 +196,11 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, C
         if (stream != null) {
           try {
             bundle = new PropertyResourceBundle(new InputStreamReader(stream, encoding));
-          } finally {
+          } 
+          catch (Exception e) {
+            Logger.error(resourceName, e);
+          }
+          finally {
             stream.close();
           }
         }
@@ -447,7 +451,7 @@ public String get(final String label, final Object... objects) {
       text = getInstance().getValue(text.substring(3).trim());
 
     // no params, nothing to parse
-    if (objects.length < 1)
+    if (objects == null || objects.length < 1)
       return text;
 
     // parse away