diff --git a/common.inc.php b/common.inc.php
index e96a79e2306e8a54771a1692580786bef8b95dfa..7a4003dc1618290159d3fb03117b498109f67eb9 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -81,8 +81,10 @@ $conf['modules']['available'] = array('static','service', 'type');
 $conf['admin']['pass'] = 'admin';
 
 global $lodspk;
-
 $lodspk['maxResults'] = 1000;
-include_once('settings.inc.php');
+
+if (file_exists(LOADSPEAKR_ROOT . '/settings.inc.php')) {
+    require_once LOADSPEAKR_ROOT . '/settings.inc.php';
+}
+
 $conf['view']['standard']['baseUrl'] = $conf['basedir'];
-?>
diff --git a/index.php b/index.php
index 3838be68a2d15f427db9351c85dcdbb2444c9c62..40ba2c83f0406e92004f5962dfa36695daeca96b 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,10 @@ use uib\ub\loadspeakr\Importer;
 use uib\ub\loadspeakr\Logging;
 use uib\ub\loadspeakr\Utils;
 
+const LOADSPEAKR_ROOT = __DIR__;
+
 require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/common.inc.php';
 
 if (isset($_GET['q']) && $_GET['q'] === 'import') {
     $imp = new Importer();
@@ -21,8 +24,6 @@ if (!file_exists('settings.inc.php')) {
     exit(0);
 }
 
-include_once('common.inc.php');
-
 $conf['logfile'] = null;
 if ($conf['debug']) {
     if (isset($_GET['q']) && $_GET['q'] === 'logs') {
@@ -64,7 +65,6 @@ if ($uri === $conf['basedir']) {
 
 // Configure external URIs if necessary.
 $localUri = $conf['basedir'] . $_GET['q'];
-$foo = $_SERVER['HTTP_HOST'];
 $uri = Utils::getMirroredUri($localUri);
 
 // Load Loadspeakr modules.