Fix bug in Error Message
Fix Error Handling Bug