closes #291: merge in parts of @RubioV/RMBingSource-offline-crash-fix