hot fix: better error messages
hot fix: better error messages 2