diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp
index a4b9c92d..5ffd8759 100644
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
@@ -918,7 +918,6 @@ void UBDesktopAnnotationController::updateMask(bool bTransparent)
 //        UBApplication::boardController->paletteManager()->mDesktopRightPalette
         if(UBApplication::boardController->paletteManager()->rightPalette()->isVisible())
         {
-            qDebug() << ">>>>>> Drawing the mask for the right palette";
             p.drawRect(UBApplication::boardController->paletteManager()->rightPalette()->geometry().x(), 
                 UBApplication::boardController->paletteManager()->rightPalette()->geometry().y(), 
                 UBApplication::boardController->paletteManager()->rightPalette()->width(), 
diff --git a/src/gui/UBCachePropertiesWidget.cpp b/src/gui/UBCachePropertiesWidget.cpp
index 0d415674..87285f61 100644
--- a/src/gui/UBCachePropertiesWidget.cpp
+++ b/src/gui/UBCachePropertiesWidget.cpp
@@ -205,16 +205,21 @@ UBCachePropertiesWidget::~UBCachePropertiesWidget()
 
 void UBCachePropertiesWidget::onCloseClicked()
 {
-    // Remove the current cache from the list
-    mCaches.remove(mCaches.indexOf(mpCurrentCache));
+    if(!mCaches.empty())
+    {
+        // Remove the current cache from the list
+        mCaches.remove(mCaches.indexOf(mpCurrentCache));
 
-    // Remove the cache from the board
-    UBApplication::boardController->activeScene()->removeItem(mpCurrentCache);
-    mpCurrentCache = NULL;
+        // Remove the cache from the board
+        UBApplication::boardController->activeScene()->removeItem(mpCurrentCache);
+        mpCurrentCache = NULL;
 
-    if(mCaches.empty())
-    {
-        emit cacheListEmpty();
+        if(mCaches.empty())
+        {
+            emit cacheListEmpty();
+        }
+
+        emit hideTab(name());
     }
 }
 
@@ -321,8 +326,8 @@ void UBCachePropertiesWidget::updateCurrentCache()
 
     // If we fall here, that means:
     // 1 - that this page has no cache
-    // 2 - we do not on Board page
-    // 3 - we in board mode, but show desktop (as really - desktop mode)
+    // 2 - we are not in Board mode
+    // 3 - we are in Board mode, but show desktop (as really - Desktop mode)
     emit hideTab(name());
     mpCurrentCache = NULL;
     setDisabled(true);
@@ -340,4 +345,4 @@ void UBCachePropertiesWidget::onCacheEnabled()
 {
     emit showTab(name());
 }
- 
\ No newline at end of file
+