Shouldn't this be marked as optional, with the type 'null' removed?