diff --git a/bootstrap.php b/bootstrap.php
index d6f75d0f7e8d30d4fe5ac78751a174ee7beaf3c4..fa13a4c1dfe7f15f99527ca4332d683e6760f0e3 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -180,7 +180,7 @@ class Bootstrap {
     function loadCode() {
         #include required files
         require_once INCLUDE_DIR.'class.util.php';
-        require INCLUDE_DIR.'class.translation.php';
+        require_once INCLUDE_DIR.'class.translation.php';
         require(INCLUDE_DIR.'class.signal.php');
         require(INCLUDE_DIR.'class.user.php');
         require(INCLUDE_DIR.'class.auth.php');
diff --git a/include/class.i18n.php b/include/class.i18n.php
index bcaf6a4eccf0b94ca2923d3304b9e855e68e9897..bfdfdfbc3cbbcfca5eaeb6bb6236f3b377223cc9 100644
--- a/include/class.i18n.php
+++ b/include/class.i18n.php
@@ -253,6 +253,9 @@ class Internationalization {
     static function getConfiguredSystemLanguages() {
         global $cfg;
 
+        if (!$cfg)
+            return self::availableLanguages();
+
         $langs = array();
         // Honor sorting preference of ::availableLanguages()
         foreach (self::availableLanguages() as $k=>$l) {
@@ -272,7 +275,7 @@ class Internationalization {
         global $cfg;
 
         if (empty($_SERVER["HTTP_ACCEPT_LANGUAGE"]))
-            return $cfg->getPrimaryLanguage();
+            return $cfg ? $cfg->getPrimaryLanguage() : 'en_US';
 
         $languages = self::getConfiguredSystemLanguages();
 
diff --git a/include/class.topic.php b/include/class.topic.php
index e628919c01c1f2f1f08cd3a2b7157596ca3776d4..6cac47112efeb2dd41d1ac8a979c6e445fce98a6 100644
--- a/include/class.topic.php
+++ b/include/class.topic.php
@@ -442,7 +442,7 @@ class Topic {
         if (!($names = static::getHelpTopics(false, true, false)))
             return;
 
-        if (function_exists('collator_create')) {
+        if ($cfg && function_exists('collator_create')) {
             $coll = Collator::create($cfg->getPrimaryLanguage());
             // UASORT is necessary to preserve the keys
             uasort($names, function($a, $b) use ($coll) {
diff --git a/include/upgrader/streams/core.sig b/include/upgrader/streams/core.sig
index 3c66643467933d668c14629d21d672cb2db1eaf3..597c10b775b63de23c72c54ee38e9fc9cee48815 100644
--- a/include/upgrader/streams/core.sig
+++ b/include/upgrader/streams/core.sig
@@ -1 +1 @@
-b26f29a6bb5dbb3510b057632182d138
+6f664a3de1435defbdcbaa64ecb2b1ea