My mistake. I initially add the check but it was still falling over. Added the annotation and didn't remove the if/else. I'll fix this in my branch.