null check and new version