fix(handlers): validate handlers before adding them

fix(handlers): validate handlers before adding them #5577