Modified error handling and added messages