correct handling of 'null'