Some minor error handling updates.