Change Formatting
Better error handling, useful for debugging