Checkpoint. Also fix issue with model repo not returning null when item not found