Added proper messages for exception handling