Fixes #190
Merge pull request #509 from opentx/bsongis/Companion_crash_190

Fixes #190