Merge "Consolidate error handling in clatStart()" into main