The existing code on this line already takes care of that. It just breaks when we do a string check for emptiness before. The latest commit fixes this.