diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index 477d3dd612..df9d444b10 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -289,7 +289,7 @@ bool OctreeServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
 #ifdef FORCE_CRASH
     if (connection->requestOperation() == QNetworkAccessManager::GetOperation
-        && path == "/force_crash") {
+        && url.path() == "/force_crash") {
 
         qDebug() << "About to force a crash!";
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 5f82700e9c..3e04b63748 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2028,6 +2028,22 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
     }
 
     if (connection->requestOperation() == QNetworkAccessManager::GetOperation) {
+#define FORCE_CRASH TRUE
+#ifdef FORCE_CRASH
+        if (url.path() == "/force_crash") {
+            qDebug() << "About to force a crash!";
+
+            int foo;
+            int* forceCrash = &foo;
+
+            QString responseString("forcing a crash...");
+            connection->respond(HTTPConnection::StatusCode200, qPrintable(responseString));
+
+            delete[] forceCrash;
+
+            return true;
+        }
+#endif
         if (url.path() == "/assignments.json") {
             // user is asking for json list of assignments
 
@@ -2203,6 +2219,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             }
         }
     } else if (connection->requestOperation() == QNetworkAccessManager::PostOperation) {
+        
         if (url.path() == URI_ASSIGNMENT) {
             // this is a script upload - ask the HTTPConnection to parse the form data
             QList<FormData> formData = connection->parseFormData();