another tidy fix (returning null sometimes, not sure why)