Added check to make sure migration doesn't fail