On_start check and except cleanup

[Red-Swingline]

I pushed the wrong branch. This merge is to clean up and then delete this branch.