* Added more error handling