Poking at phantom segfault issues.
Merge pull request #780 from mapbox/phantom-segfault

Poking at phantom segfault