Better error handling
Revised error message