This fixes some rare segfaults (see issues #369 and #293). From upstream git commit f6df7d7e510f2d8879ec54dce32fee2b691dc32d