This is in the old code, not newly ng written stuff (trying to change the least possible), also seems pretty harmless/safe to extra-catch stuff here vs. exiting...