diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java
index 8d7290997a0e9dc44050ed9603b1368a48349b84..894c94f814bfc4fbd4cb34933b60cb5ee33eb9d4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java
@@ -114,7 +114,10 @@ public abstract class AbstractDataSetsSection extends DisposableTabContent
     {
         // when tab is closed dispose also the metadata component
         super.disposeComponents();
-        metadataComponent.dispose(); // NOTE: second dispose on a grid does nothing
+        if (metadataComponent != null)
+        {
+            metadataComponent.dispose(); // NOTE: second dispose on a grid does nothing
+        }
     }
 
     private static AbstractExternalDataGrid extractBrowser(IDisposableComponent metadataComponent)