diff --git a/magnolia-i18n/src/main/java/info/magnolia/i18nsystem/proxytoys/I18nTextMethodDecorator.java b/magnolia-i18n/src/main/java/info/magnolia/i18nsystem/proxytoys/I18nTextMethodDecorator.java
index 2914fc0..93e4f9d 100644
--- a/magnolia-i18n/src/main/java/info/magnolia/i18nsystem/proxytoys/I18nTextMethodDecorator.java
+++ b/magnolia-i18n/src/main/java/info/magnolia/i18nsystem/proxytoys/I18nTextMethodDecorator.java
@@ -63,7 +63,12 @@ public class I18nTextMethodDecorator<T> extends Decorator<T> {
     }
 
     protected Object decorate(String undecoratedResult, T proxiedObject, Method method) {
-        final String[] keys = keyGenerator.keysFor(undecoratedResult, proxiedObject, method);
+        final String[] keys ;
+        if (undecoratedResult != null) {
+            keys = new String[] {undecoratedResult};
+        } else {
+            keys = keyGenerator.keysFor(undecoratedResult, proxiedObject, method);
+        }
         final String basename = keyGenerator.messageBundleNameFor(proxiedObject);
 
         return translationService.translate(localeProvider, basename, keys);