Update When is 'return null' valid