#13 - remove abusive null check