Fixes for nullpointer in rerun check