diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 6b44503af4..bc6841e626 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3523,12 +3523,13 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
     } else {
         // start the script on a new thread...
         scriptEngine = new ScriptEngine(scriptUrl, &_controllerScriptingInterface);
-        _scriptEnginesHash.insert(scriptURLString, scriptEngine);
 
         if (!scriptEngine->hasScript()) {
             qDebug() << "Application::loadScript(), script failed to load...";
             return NULL;
         }
+
+        _scriptEnginesHash.insert(scriptURLString, scriptEngine);
         _runningScriptsWidget->setRunningScripts(getRunningScripts());
     }
 
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index a4aae61248..b0cce114a9 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -147,7 +147,12 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL,
             QEventLoop loop;
             QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
             loop.exec();
-            _scriptContents = reply->readAll();
+            if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 200) {
+                _scriptContents = reply->readAll();
+            } else {
+                qDebug() << "ERROR Loading file:" << url.toString();
+                emit errorMessage("ERROR Loading file:" + url.toString());
+            }
         }
     }
 }