diff --git a/app/src/main/java/com/jens/automation2/receivers/ConnectivityReceiver.java b/app/src/main/java/com/jens/automation2/receivers/ConnectivityReceiver.java
index 46db0ef..41e4314 100644
--- a/app/src/main/java/com/jens/automation2/receivers/ConnectivityReceiver.java
+++ b/app/src/main/java/com/jens/automation2/receivers/ConnectivityReceiver.java
@@ -136,7 +136,12 @@ public class ConnectivityReceiver extends BroadcastReceiver implements Automatio
 				// Airplane mode status has changed.
 				Miscellaneous.logEvent("i", "Connectivity", "Airplane mode changed.", 2);
 				boolean isAirplaneMode = isAirplaneMode(context);
-				automationServiceRef.getLocationProvider().handleAirplaneMode(isAirplaneMode);
+
+                /*
+                    If the user doesn't have any locations this service is probably off and therefore null.
+                 */
+                if(automationServiceRef.getLocationProvider() != null)
+				    automationServiceRef.getLocationProvider().handleAirplaneMode(isAirplaneMode);
 
 				ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger_Enum.airplaneMode);
 //				ArrayList<Rule> ruleCandidates = Rule.findRuleCandidatesByAirplaneMode(isAirplaneMode);
diff --git a/fastlane/metadata/android/en-US/changelogs/145.txt b/fastlane/metadata/android/en-US/changelogs/145.txt
index 1932c23..9a18406 100644
--- a/fastlane/metadata/android/en-US/changelogs/145.txt
+++ b/fastlane/metadata/android/en-US/changelogs/145.txt
@@ -2,4 +2,5 @@
 * Fixed: trigger url result was not stored correctly in a variable
 * Fixed: Crash when clicking +/- when creating/editing TimeFrame trigger
 * Fixed: Permission BLUETOOTH_CONNECT requested for Bluetooth trigger editor in Google Play version
+* Fixed: Airplane mode trigger didn't work if no locations where defined.
 * Added Possibility to select UI theme, hence enabling modern UI designs
\ No newline at end of file