diff --git a/pmb/config/init.py b/pmb/config/init.py
index d6e10834..ecd59834 100644
--- a/pmb/config/init.py
+++ b/pmb/config/init.py
@@ -222,6 +222,11 @@ def ask_for_device(args):
         device_exists = os.path.exists(args.aports + "/device/device-" +
                                        device + "/deviceinfo")
         if not device_exists:
+            if device == args.device:
+                raise RuntimeError(
+                    "This device does not exist anymore, check"
+                    " <https://postmarketos.org/renamed>"
+                    " to see if it was renamed")
             logging.info("You are about to do a new device port for '" +
                          device + "'.")
             if not pmb.helpers.cli.confirm(args, default=True):
diff --git a/pmb/parse/deviceinfo.py b/pmb/parse/deviceinfo.py
index d93bafe4..19190dc0 100644
--- a/pmb/parse/deviceinfo.py
+++ b/pmb/parse/deviceinfo.py
@@ -57,12 +57,10 @@ def deviceinfo(args, device=None):
 
     aport = args.aports + "/device/device-" + device
     if not os.path.exists(aport) or not os.path.exists(aport + "/deviceinfo"):
-        logging.fatal("You will need to create a device-specific package")
-        logging.fatal("before you can continue. Please create at least the")
-        logging.fatal("following files:")
-        logging.fatal(aport + "/APKBUILD")
-        logging.fatal(aport + "/deviceinfo")
-        raise RuntimeError("Incomplete device information")
+        raise RuntimeError(
+            "Device '" + device + "' not found. Run 'pmbootstrap init' to"
+            " start a new device port or to choose another device. It may have"
+            " been renamed, see <https://postmarketos.org/renamed>")
 
     ret = {}
     path = aport + "/deviceinfo"