Null handling after Matt's changes - need to review - but this is a
showstopper so workaround in place
Merge branch 'master' of https://github.com/skyvers/wildcat