Fix issue with missing target

I'm hoping this happens less, but still don't want an NPE.