improved error message
cleanup