First attempt to fix crash in case gapps missing