Maybe with #245 this can be null? Seems to be related.