Make sure null is not returned
Merged mac commits