1 files changed, 5 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java b/app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java
index 65355a67..370a7af6 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java
@@ -71,6 +71,11 @@ public class BitmaskTileService extends TileService implements Observer {
     @Override
     public void update(Observable o, Object arg) {
         Tile t = getQsTile();
+        // Tile t should never be null according to https://developer.android.com/reference/kotlin/android/service/quicksettings/TileService.
+        // Hovever we've got crash reports.
+        if (t == null) {
+            return;
+        }
 
         if (o instanceof EipStatus) {
             EipStatus status = (EipStatus) o;