tentative fix for SAN-281

 #ShotGunDebugging
Merge pull request #28 from thehyve/issues/SAN-281_UI_crash

tentative fix for SAN-281