extra null check, #270