Bug fix; loadById may return null