diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 7d10928d87..35811e0eab 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -233,6 +233,9 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
 }
 
 Application::~Application() {
+    // make sure we don't call the idle timer any more
+    delete idleTimer;
+
     // ask the audio thread to quit and wait until it is done
     _audio.thread()->quit();
     _audio.thread()->wait();
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index c1d9bd778d..31468f1320 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -29,10 +29,13 @@ int main(int argc, const char * argv[]) {
     QCoreApplication::addLibraryPath(QT_RELEASE_PLUGIN_PATH);
     #endif
 
-    Application app(argc, const_cast<char**>(argv), startup_time);
+    int exitCode;
+    {
+        Application app(argc, const_cast<char**>(argv), startup_time);
     
-    qDebug( "Created QT Application.\n" );
-    int exitCode = app.exec();
+        qDebug( "Created QT Application.\n" );
+        exitCode = app.exec();
+    }
     qDebug("Normal exit.\n");
     return exitCode;
 }