Clean-up error handling and output paths for snapshot.