Errors Handling Added