Merge "Handle recording failure more gracefully."