NSTAR-2953 removed more "except:" and tabs