Slightly better error message
Looks ready to go