tested and working

code/moya-angular/src/app/components/moya-locale/moya-locale.service.ts

@@ -28,14 +28,14 @@ export class MoyaLocaleService {
 
       const locale = untypedLocale as MoyaLocale;
 
-      if (locale.userLocale) {
+      if (locale && locale.userLocale) {
         return locale.userLocale;
       }
 
-      let cookieLocale = localStorage.getItem(LOCALSTORAGE_NAME);
+      let storageLocale = localStorage.getItem(LOCALSTORAGE_NAME);
 
-      if(cookieLocale) {
-        return cookieLocale;
+      if(storageLocale) {
+        return storageLocale;
       }
 
       if(locale.eventLocale) {

code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/UserBeanLocal.java

@@ -47,7 +47,7 @@ public interface UserBeanLocal {
 
 	String getUsersLocale();
 
-	void setUsersLocale(String locale);
+	boolean setUsersLocale(String locale);
 
 	List<EventUser> getUsers();
 

code/moya-beans/ejbModule/fi/codecrew/moya/beans/UserBean.java

@@ -189,16 +189,17 @@ public class UserBean implements UserBeanLocal {
 	}
 
 	@Override
-	public void setUsersLocale(String locale) {
+	public boolean setUsersLocale(String locale) {
 
 		if(permbean.getCurrentUser().isAnonymous()) {
-			return;
+			return false;
 		}
 
 		// Attach user to database
 		User u = userFacade.reload(permbean.getCurrentUser().getUser());
-
 		u.setLocale(locale);
+
+		return true;
 	}
 
 	@Override

code/moya-web/src/main/java/fi/codecrew/moya/rest/v3/LocaleRestViewV3.java

@@ -36,8 +36,10 @@ public class LocaleRestViewV3 {
 	@POST
 	@Path("/")
 	public Response setCurrentLocale(LocalePojoV3 locale) {
-		userBean.setUsersLocale(locale.userLocale);
-
+		if(userBean.setUsersLocale(locale.userLocale)) {
 			return Response.ok().build();
 		}
+
+		return Response.status(420).build();
+	}
 }