More error catching
More error catching