Exception handling

Fixes #697

Author: samgeorges

classes/ThemeScanner.php

@@ -107,15 +107,16 @@ protected function scanThemeConfigForMessagesInternal(Theme $theme)
             return false;
         }
 
-        $translator = Translator::instance();
         $keys = [];
-
         foreach ($config as $locale => $messages) {
             if (is_string($messages)) {
                 // $message is a yaml filename, load the yaml file
                 $messages = $theme->getConfigArray('translate.'.$locale);
             }
-            $keys = array_merge($keys, array_keys($messages));
+
+            if (is_array($messages)) {
+                $keys = array_merge($keys, array_keys($messages));
+            }
         }
 
         Message::importMessages($keys);
@@ -125,7 +126,10 @@ protected function scanThemeConfigForMessagesInternal(Theme $theme)
                 // $message is a yaml filename, load the yaml file
                 $messages = $theme->getConfigArray('translate.'.$locale);
             }
-            Message::importMessageCodes($messages, $locale);
+
+            if (is_array($messages)) {
+                Message::importMessageCodes($messages, $locale);
+            }
         }
     }