Stop issue #77 from crashing the app.