diff --git a/src/Mod/Ship/shipCreateShip/TaskPanel.py b/src/Mod/Ship/shipCreateShip/TaskPanel.py
index bee6c6964..3162702f1 100644
--- a/src/Mod/Ship/shipCreateShip/TaskPanel.py
+++ b/src/Mod/Ship/shipCreateShip/TaskPanel.py
@@ -119,7 +119,9 @@ class TaskPanel:
         self.faces = None
         selObjs  = Geometry.getSelectedObjs()
         if not selObjs:
-            msg = Translator.translate("All ship surfaces must be selected (Any object has been selected)\n")
+            msg = Translator.translate("Ship objects can only be created on top of hull geometry (any object selected).\n"
+            App.Console.PrintError(msg)
+            msg = Translator.translate("Please create or download a ship hull geometry before using this tool\n")
             App.Console.PrintError(msg)
             return True
         self.faces = []
@@ -128,7 +130,9 @@ class TaskPanel:
             for j in range(0, len(faces)):
                 self.faces.append(faces[j])
         if not self.faces:
-            msg = Translator.translate("All ship surfaces must be selected (Any face found into selected objects)\n")
+            msg = Translator.translate("Ship objects can only be created on top of hull geometry (any face object selected).\n"
+            App.Console.PrintError(msg)
+            msg = Translator.translate("Please create or download a ship hull geometry before using this tool\n")
             App.Console.PrintError(msg)
             return True
         # Get bounds