diff --git a/scripts/teleport.lua b/scripts/teleport.lua
index ffe798f5d..64a456219 100644
--- a/scripts/teleport.lua
+++ b/scripts/teleport.lua
@@ -36,7 +36,8 @@ if args.showunitid or args.showpos then
  end
 else
  local unit = args.unit and df.unit.find(args.unit) or dfhack.gui.getSelectedUnit(true)
- local pos = not(not args.x or not args.y or not args.z) and {x=args.x,y=args.y,z=args.z} or df.global.cursor
-
+ local pos = not(not args.x or not args.y or not args.z) and {x=args.x,y=args.y,z=args.z} or {x=df.global.cursor.x,y=df.global.cursor.y,z=df.global.cursor.z}
+ if not unit then qerror('A unit needs to be selected or specified. Use teleport -showunitid to get a unit\'s ID.') end
+ if not pos.x or pos.x==-30000 then qerror('A position needs to be highlighted or specified. Use teleport -showpos to get a position\'s exact xyz values.') end
  teleport(unit,pos)
 end