(#1408) - make sure callbacks are not inside promise try/catchs