--- a/foodtruck/web.py	Sun Jul 03 16:44:18 2016 -0700
+++ b/foodtruck/web.py	Mon Jul 04 00:12:49 2016 -0700
@@ -3,6 +3,8 @@
 from flask import Flask
 from werkzeug import SharedDataMiddleware
 from .blueprint import foodtruck_bp, login_manager, bcrypt_ext
+from .configuration import FoodTruckConfigNotFoundError
+from .sites import InvalidSiteError
 
 
 logger = logging.getLogger(__name__)
@@ -13,7 +15,7 @@
     app.config.from_object('foodtruck.settings')
     app.config.from_envvar('FOODTRUCK_SETTINGS', silent=True)
     if extra_settings:
-        app.config.from_object(extra_settings)
+        app.config.update(extra_settings)
 
     admin_root = app.config.setdefault('FOODTRUCK_ROOT', os.getcwd())
     config_path = os.path.join(admin_root, 'app.cfg')