Merge "Simplify error handling after track creation"