cleaner error message
minor cleanup