Cleaned up the code#4 + Error handling