Minor cleanup and simple global catch exception strategy added.