killbill-aplcache

diff --git a/util/src/main/java/com/ning/billing/util/template/translation/DefaultTranslatorBase.java b/util/src/main/java/com/ning/billing/util/template/translation/DefaultTranslatorBase.java
index 2b3f62e..72d3d90 100644
--- a/util/src/main/java/com/ning/billing/util/template/translation/DefaultTranslatorBase.java
+++ b/util/src/main/java/com/ning/billing/util/template/translation/DefaultTranslatorBase.java
@@ -55,6 +55,11 @@ public abstract class DefaultTranslatorBase implements Translator {
         if ((bundle != null) && (bundle.containsKey(originalText))) {
             return bundle.getString(originalText);
         } else {
+            if (config.getDefaultLocale() == null) {
+                log.warn(String.format(ErrorCode.MISSING_DEFAULT_TRANSLATION_RESOURCE.toString(), getTranslationType()));
+                return originalText;
+            }
+
             final Locale defaultLocale = new Locale(config.getDefaultLocale());
             try {
                 bundle = getBundle(defaultLocale, bundlePath);
@@ -102,6 +107,8 @@ public abstract class DefaultTranslatorBase implements Translator {
             } else {
                 return new PropertyResourceBundle(inputStream);
             }
+        } catch (IllegalArgumentException iae) {
+            return null;
         } catch (MissingResourceException mrex) {
             return null;
         } catch (URISyntaxException e) {

diff --git a/util/src/test/java/com/ning/billing/util/template/translation/TestDefaultTranslatorBase.java b/util/src/test/java/com/ning/billing/util/template/translation/TestDefaultTranslatorBase.java
new file mode 100644
index 0000000..d379804
--- /dev/null
+++ b/util/src/test/java/com/ning/billing/util/template/translation/TestDefaultTranslatorBase.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2012 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.util.template.translation;
+
+import java.util.Locale;
+import java.util.UUID;
+
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class TestDefaultTranslatorBase {
+    private final class TestTranslatorBase extends DefaultTranslatorBase {
+        public TestTranslatorBase(final TranslatorConfig config) {
+            super(config);
+        }
+
+        @Override
+        protected String getBundlePath() {
+            return UUID.randomUUID().toString();
+        }
+
+        @Override
+        protected String getTranslationType() {
+            return UUID.randomUUID().toString();
+        }
+    }
+
+    @Test(groups = "fast")
+    public void testResourceDoesNotExist() throws Exception {
+        final TestTranslatorBase translator = new TestTranslatorBase(Mockito.mock(TranslatorConfig.class));
+        final String originalText = UUID.randomUUID().toString();
+        Assert.assertEquals(translator.getTranslation(Locale.FRANCE, originalText), originalText);
+    }
+}