diff --git a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
index 29bfd51b..41a3262b 100644
--- a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
@@ -523,15 +523,18 @@ namespace ENI2.DetailViewControls
 
         private void buttonSearchPortArea_Click(object sender, RoutedEventArgs e)
         {
-            SelectPortAreaDialog spad = new SelectPortAreaDialog(this.Core.PoC);
-            if(spad.ShowDialog() ?? false)
+            if (portAreas != null)
             {
-                if(spad.SelectedArea != null)
+                SelectPortAreaDialog spad = new SelectPortAreaDialog(this.Core.PoC);
+                if (spad.ShowDialog() ?? false)
                 {
-                    if (portAreas.ContainsKey(spad.SelectedArea))
+                    if (spad.SelectedArea != null)
                     {
-                        var pair = portAreas.SingleOrDefault(p => p.Key == spad.SelectedArea);
-                        this.comboBoxPortArea.SelectedItem = pair;
+                        if (portAreas.ContainsKey(spad.SelectedArea))
+                        {
+                            var pair = portAreas.SingleOrDefault(p => p.Key == spad.SelectedArea);
+                            this.comboBoxPortArea.SelectedItem = pair;
+                        }
                     }
                 }
             }
diff --git a/misc/db.sqlite b/misc/db.sqlite
index 37077ba8..34e237b9 100644
Binary files a/misc/db.sqlite and b/misc/db.sqlite differ