More cleanup and remove the last try-catch
More cleanup and remove the last try-catch

GridProtectionAlliance/gsf,GridProtectionAlliance/gsf,GridProtectionAlliance/gsf,GridProtectionAlliance/gsf,GridProtectionAlliance/gsf,GridProtectionAlliance/gsf,GridProtectionAlliance/gsf,GridProtectionAlliance/gsf