@willnorris could you take a look at #400 when you have a chance? It looks like it just needs a simple null check to me.