diff --git a/src/tree/health/HealthTreeItemProvider.ts b/src/tree/health/HealthTreeItemProvider.ts
index 8e6f1a0..7752ce3 100644
--- a/src/tree/health/HealthTreeItemProvider.ts
+++ b/src/tree/health/HealthTreeItemProvider.ts
@@ -32,6 +32,11 @@ export class HealthTreeItemProvider implements vscode.TreeDataProvider<vscode.Tr
     }
 
     async getChildren(element?: HealthTreeItem): Promise<vscode.TreeItem[]> {
+
+        if (healthClient === undefined) {
+            return [];
+        }
+
         // get children for root
         if (element === undefined) {
             const health = await healthClient.checkup();
diff --git a/src/tree/storage/StorageTreeItemProvider.ts b/src/tree/storage/StorageTreeItemProvider.ts
index 9e2875f..14a6dbf 100644
--- a/src/tree/storage/StorageTreeItemProvider.ts
+++ b/src/tree/storage/StorageTreeItemProvider.ts
@@ -20,9 +20,13 @@ export class StorageTreeItemProvider implements vscode.TreeDataProvider<vscode.T
     }
 
     async getChildren(element?: vscode.TreeItem): Promise<vscode.TreeItem[]> {
+        if (storageClient === undefined) {
+            return [];
+        }
+
         const files = await storageClient.listFiles();
         if (files === undefined || files?.files.length === 0) {
-            const noStorage = new vscode.TreeItem('No files found');
+            const noStorage = new vscode.TreeItem("No files found");
             return [noStorage];
         }
         return files.files.map((file) => new FileTreeItem(file));