Merge pull request #1370 from ey6es/master

Fix for crash that Philip was seeing.