Yes, it shouldn't ever be null. I was seeing an NPE at one point early on whilst making these changes. It's no longer an issue after the various refactorings so I've removed the nil check.