Proper error handling
Trying new formatting