null check and durability enhancement