diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php
index 0bddca83..248e376c 100644
--- a/app/Http/Controllers/Admin/DashboardController.php
+++ b/app/Http/Controllers/Admin/DashboardController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use Auth;
 use Flash;
+use Log;
 use Version;
 use Illuminate\Http\Request;
 
@@ -36,11 +37,16 @@ class DashboardController extends BaseController
      */
     protected function checkNewVersion()
     {
-        $current_version = new semver(Version::compact());
-        $latest_version = new semver(Utils::downloadUrl(config('phpvms.version_file')));
+        try {
+            $current_version = new semver(Version::compact());
+            $latest_version = new semver(Utils::downloadUrl(config('phpvms.version_file')));
 
-        if(semver::gt($latest_version, $current_version)) {
-            Flash::warning('New version '.$latest_version.' is available!');
+            if (semver::gt($latest_version, $current_version)) {
+                Flash::warning('New version ' . $latest_version . ' is available!');
+            }
+        } catch (\Exception $e) {
+            Log::error($e->getMessage());
+            Flash::warning('Could not contact phpVMS for version check');
         }
     }
 
diff --git a/app/Services/AnalyticsService.php b/app/Services/AnalyticsService.php
index e6162257..02489069 100644
--- a/app/Services/AnalyticsService.php
+++ b/app/Services/AnalyticsService.php
@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use DB;
+use Log;
 use PDO;
 
 use Irazasyed\LaravelGAMP\Facades\GAMP;
@@ -32,7 +33,11 @@ class AnalyticsService
             AnalyticsDimensions::DATABASE_VERSION
         );
 
-        $gamp->sendPageview();
+        try {
+            $gamp->sendPageview();
+        } catch (\Exception $e) {
+            Log::error($e->getMessage());
+        }
     }
 
 }
diff --git a/app/Services/UserService.php b/app/Services/UserService.php
index a74d570f..6b813020 100644
--- a/app/Services/UserService.php
+++ b/app/Services/UserService.php
@@ -151,7 +151,7 @@ class UserService extends BaseService
 
         # If their current rank is one they were assigned, then
         # don't change away from it automatically.
-        if($user->rank->auto_promote === false) {
+        if($user->rank && $user->rank->auto_promote === false) {
             return $user;
         }
 
diff --git a/resources/views/layouts/default/dashboard/index.blade.php b/resources/views/layouts/default/dashboard/index.blade.php
index 4027ef06..6c8aa5b7 100644
--- a/resources/views/layouts/default/dashboard/index.blade.php
+++ b/resources/views/layouts/default/dashboard/index.blade.php
@@ -34,7 +34,11 @@
                         <div style="float: left; position: absolute; display:block; top: 0px;font-size: 150px">
                             <i class="fa fa-location-arrow" style="opacity: .1;"></i>
                         </div>
-                        <h4 class="">{!! $user->current_airport->icao !!}</h4>
+                        @if($user->current_airport)
+                            <h4 class="">{!! $user->current_airport->icao !!}</h4>
+                        @else
+                            <h4 class="">-</h4>
+                        @endif
                         <h5 class="description" style="color: white;">current airport</h5>
                     </div>
                 </div>
diff --git a/resources/views/layouts/default/users/table.blade.php b/resources/views/layouts/default/users/table.blade.php
index 244f0ac8..80f919ca 100644
--- a/resources/views/layouts/default/users/table.blade.php
+++ b/resources/views/layouts/default/users/table.blade.php
@@ -29,7 +29,13 @@
                 @endif
             </td>
             <td class="text-center">{!! $user->airline->icao !!}</td>
-            <td class="text-center">{!! $user->curr_airport_id !!}</td>
+            <td class="text-center">
+                @if($user->current_airport)
+                    {!! $user->curr_airport_id !!}
+                @else
+                    -
+                @endif
+            </td>
             <td align="center">{!! $user->flights !!}</td>
             <td align="center">{!! \App\Facades\Utils::minutesToTimeString($user->flight_time) !!}</td>
         </tr>