return null instead of false

return null instead of false #5332