More solid first run in case of error & a second run

Yeah second run on the first run I know I know...