Just some null checks required - were caught by SmartStore tests.