diff --git a/app/src/main/java/com/limelight/AppView.java b/app/src/main/java/com/limelight/AppView.java
index 989a6e5d..5624a014 100644
--- a/app/src/main/java/com/limelight/AppView.java
+++ b/app/src/main/java/com/limelight/AppView.java
@@ -81,6 +81,10 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
                     // Get the computer object
                     computer = managerBinder.getComputer(UUID.fromString(uuidString));
+                    if (computer == null) {
+                        finish();
+                        return;
+                    }
 
                     try {
                         appGridAdapter = new AppGridAdapter(AppView.this,