Return null from getById if the record isn't found
Merge pull request #1299 from jamiebikies/master

Return null from getById if the record isn't found