safeguard if value is None (#1260)