From a6ab0cd9fceacbb4c4fc21a37eb47db8e4299cb6 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 13 May 2013 11:46:07 +0200
Subject: [PATCH] fix NPE

---
 .../frontend/utils/InternationalizationDevelopmentFilter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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);