diff --git a/hassio/const.py b/hassio/const.py
index 0181240b1..c149ab5a4 100644
--- a/hassio/const.py
+++ b/hassio/const.py
@@ -2,7 +2,7 @@
 from pathlib import Path
 from ipaddress import ip_network
 
-HASSIO_VERSION = '0.94'
+HASSIO_VERSION = '0.95'
 
 URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
                       'hassio/{}/version.json')
diff --git a/hassio/snapshots/__init__.py b/hassio/snapshots/__init__.py
index 0cd2171bb..18a1fcf67 100644
--- a/hassio/snapshots/__init__.py
+++ b/hassio/snapshots/__init__.py
@@ -173,14 +173,16 @@ class SnapshotManager(CoreSysAttributes):
                     if addon and addon.is_installed:
                         addon_list.append(addon)
                         continue
-                    _LOGGER.warning("Add-on %s not found", addon_slug)
+                    _LOGGER.warning("Add-on %s not found/installed", addon_slug)
 
-                _LOGGER.info("Snapshot %s store Add-ons", snapshot.slug)
-                await snapshot.store_addons(addon_list)
+                if addon_list:
+                    _LOGGER.info("Snapshot %s store Add-ons", snapshot.slug)
+                    await snapshot.store_addons(addon_list)
 
-                # snapshot folders
-                _LOGGER.info("Snapshot %s store folders", snapshot.slug)
-                await snapshot.store_folders(folders)
+                # Snapshot folders
+                if folders:
+                    _LOGGER.info("Snapshot %s store folders", snapshot.slug)
+                    await snapshot.store_folders(folders)
 
         except Exception:  # pylint: disable=broad-except
             _LOGGER.exception("Snapshot %s error", snapshot.slug)
diff --git a/hassio/snapshots/snapshot.py b/hassio/snapshots/snapshot.py
index 0ee11a6f6..7077e9c4e 100644
--- a/hassio/snapshots/snapshot.py
+++ b/hassio/snapshots/snapshot.py
@@ -151,7 +151,7 @@ class Snapshot(CoreSysAttributes):
 
     def _encrypt_data(self, data):
         """Make data secure."""
-        if not self._key:
+        if not self._key or data is None:
             return data
 
         return b64encode(
@@ -159,7 +159,7 @@ class Snapshot(CoreSysAttributes):
 
     def _decrypt_data(self, data):
         """Make data readable."""
-        if not self._key:
+        if not self._key or data is None:
             return data
 
         return Padding.unpad(
diff --git a/version.json b/version.json
index b36161b07..dc46889a6 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-    "hassio": "0.94",
+    "hassio": "0.95",
     "homeassistant": "0.64.0",
     "resinos": "1.1",
     "resinhup": "0.3",