added conditional to avoid null switching after durability test