Shifted around error messages, fixes #416, #417