Fixed message
Improved error handling