diff --git a/HIBPOfflineCheck/HIBPOfflineColumnProv.cs b/HIBPOfflineCheck/HIBPOfflineColumnProv.cs
index c2475b5..78bb0ea 100644
--- a/HIBPOfflineCheck/HIBPOfflineColumnProv.cs
+++ b/HIBPOfflineCheck/HIBPOfflineColumnProv.cs
@@ -369,6 +369,9 @@ public async void CheckAll()
         {
             bulkCheck = true;
 
+            if (Host.Database == null || Host.Database.RootGroup == null)
+                return;
+
             var progressDisplay = new ProgressDisplay();
             progressDisplay.Show();
 
@@ -397,6 +400,9 @@ public async void CheckAll()
 
         public void ClearAll()
         {
+            if (Host.Database == null || Host.Database.RootGroup == null)
+                return;
+
             DialogResult dialog = MessageBox.Show("This will remove the HIBP status for all entries in the database. Continue?",
                 String.Empty, MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
 
@@ -427,12 +433,15 @@ public async void OnMenuHIBP(object sender, EventArgs e)
         {
             bulkCheck = true;
 
-            var progressDisplay = new ProgressDisplay();
-            progressDisplay.Show();
-
             MainForm mainForm = HIBPOfflineCheckExt.Host.MainWindow;
             PwEntry[] selectedEntries = mainForm.GetSelectedEntries();
 
+            if (selectedEntries == null)
+                return;
+
+            var progressDisplay = new ProgressDisplay();
+            progressDisplay.Show();
+
             for (int j = 0; j < selectedEntries.Length; j++)
             {
                 PasswordEntry = selectedEntries[j];
@@ -455,10 +464,13 @@ public async void OnMenuHIBP(object sender, EventArgs e)
 
         public void OnMenuHIBPClear(object sender, EventArgs e)
         {
+            bulkCheck = true;
+
             MainForm mainForm = HIBPOfflineCheckExt.Host.MainWindow;
             PwEntry[] selectedEntries = mainForm.GetSelectedEntries();
 
-            bulkCheck = true;
+            if (selectedEntries == null)
+                return;
 
             foreach (PwEntry pwEntry in selectedEntries)
             {
@@ -475,10 +487,13 @@ public void OnMenuHIBPClear(object sender, EventArgs e)
 
         public void OnMenuHIBPExclude(object sender, EventArgs e)
         {
+            bulkCheck = true;
+
             MainForm mainForm = HIBPOfflineCheckExt.Host.MainWindow;
             PwEntry[] selectedEntries = mainForm.GetSelectedEntries();
 
-            bulkCheck = true;
+            if (selectedEntries == null)
+                return;
 
             foreach (PwEntry pwEntry in selectedEntries)
             {
diff --git a/HIBPOfflineCheck/Properties/AssemblyInfo.cs b/HIBPOfflineCheck/Properties/AssemblyInfo.cs
index 72102c8..6a8befc 100644
--- a/HIBPOfflineCheck/Properties/AssemblyInfo.cs
+++ b/HIBPOfflineCheck/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.2.0")]
-[assembly: AssemblyFileVersion("1.7.2.0")]
+[assembly: AssemblyVersion("1.7.3.0")]
+[assembly: AssemblyFileVersion("1.7.3.0")]
diff --git a/version.txt b/version.txt
index 393083a..8f91517 100644
--- a/version.txt
+++ b/version.txt
@@ -1,3 +1,3 @@
 :
-HIBPOfflineCheck:1.7.2.0
+HIBPOfflineCheck:1.7.3.0
 :