diff --git a/sms_registration.py b/sms_registration.py
index fdf8ff6..896fb54 100644
--- a/sms_registration.py
+++ b/sms_registration.py
@@ -20,10 +20,12 @@ def register(push_token: bytes, no_parse = False, gateway = None) -> tuple[str,
         print("MCC+MNC received! " + mccmnc)
         print("Determining gateway...")
         gateway = gateway_fetch.getGatewayMCCMNC(mccmnc)
-        print("Gateway found!  " + gateway)
-    if gateway is None:
-        print("Automatic gateway detection failed, switching to default...")
-        gateway = GATEWAY
+    if gateway is not None:
+        print("Gateway found!  " + str(gateway))
+    else:
+        print("No gateway was provided, and automatic gateway detection failed. Please run again with the --gateway flag.")
+        # gateway = GATEWAY
+        raise
     token = push_token.hex().upper()
     req_id = random.randint(0, 2**32)
     sms = f"REG-REQ?v=3;t={token};r={req_id};"