fix: Verify nil value consistently (#1478)

fix: Verify nil value consistently (#1478) #1233