Clean up error handling in test/checkpoint.