Fix support of !!null shortand