Fix fresh pull throwing an exception