Changed name and added simple error handling