Better error message and remove bad joke