From 41edd0567d902792859c86b2bb2f0289efdd8877 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Sun, 23 Apr 2017 17:18:00 +0000
Subject: [PATCH] Don't try to parse non-strings

---
 src/utils.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/utils.js b/src/utils.js
index 8225c8a49..8712777ac 100755
--- a/src/utils.js
+++ b/src/utils.js
@@ -457,14 +457,16 @@
     }
 
     utils.getLocale = function (preferred_locale, isSupportedByLibrary) {
-        if (preferred_locale === 'en' || isSupportedByLibrary(preferred_locale)) {
-            return preferred_locale;
-        }
-        try {
-            var obj = window.JSON.parse(preferred_locale);
-            return obj.locale_data.converse[""].lang;
-        } catch (e) {
-            console.log(e);
+        if (_.isString(preferred_locale)) {
+            if (preferred_locale === 'en' || isSupportedByLibrary(preferred_locale)) {
+                return preferred_locale;
+            }
+            try {
+                var obj = window.JSON.parse(preferred_locale);
+                return obj.locale_data.converse[""].lang;
+            } catch (e) {
+                console.log(e);
+            }
         }
         return utils.detectLocale(isSupportedByLibrary) || 'en';
     };