A potential fix to a crash I cannot reproduce
Merge pull request #4 from spotify/drewc/crashfix

A potential fix to a crash I cannot reproduce