Deployers reformatted to check for nulls in finally blocks