Fixed issue #2176 by supporting return null, and return <value>