Merge "Add exception handler for easier debugging."