diff --git a/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java b/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java
index c1577366..0eecb1ef 100644
--- a/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java
+++ b/src/main/java/com/commafeed/frontend/utils/InternationalizationDevelopmentFilter.java
@@ -65,8 +65,8 @@ public class InternationalizationDevelopmentFilter implements Filter {
 
 		UserSettings settings = userSettingsDAO.findByUser(CommaFeedSession
 				.get().getUser());
-		String lang = settings.getLanguage() == null ? "en" : settings
-				.getLanguage();
+		String lang = (settings == null || settings.getLanguage() == null) ? "en"
+				: settings.getLanguage();
 
 		byte[] bytes = translate(wrapper.toString(), lang).getBytes("UTF-8");
 		response.setContentLength(bytes.length);