Fix initial check errors to use supplied callback