More error handling.
Formatting