From 3ec52987eb78fe5d50039caeed4dd67680d72753 Mon Sep 17 00:00:00 2001
From: Riley McArdle <riley@mremoteng.org>
Date: Tue, 31 May 2011 16:57:25 -0500
Subject: [PATCH] Fixed NullReferenceException in App.Runtime.

---
 mRemoteV1/App/App.Runtime.vb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb
index 402a3627..a6a73eeb 100644
--- a/mRemoteV1/App/App.Runtime.vb
+++ b/mRemoteV1/App/App.Runtime.vb
@@ -385,8 +385,10 @@ Namespace App
                 Try
                     LastSQLUpdate = Nothing
                     RemoveHandler Tools.Misc.SQLUpdateCheckFinished, AddressOf SQLUpdateCheckFinished
-                    tmrSqlWatcher.Stop()
-                    tmrSqlWatcher.Close()
+                    If tmrSqlWatcher IsNot Nothing Then
+                        tmrSqlWatcher.Stop()
+                        tmrSqlWatcher.Close()
+                    End If
                 Catch ex As Exception
                 End Try
             End Sub