diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index a843b8caa..17c1915bc 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -1594,13 +1594,28 @@ void MainWindow::FullParseFile()
     ui->actionPattern_properties->setEnabled(true);
 
     qint32 index = comboBoxDraws->findText(patternPiece);
-    if ( index != -1 )
-    { // -1 for not found
-        currentDrawChanged(index);
-    }
-    else
+    try
     {
-        currentDrawChanged(0);
+        if ( index != -1 )
+        { // -1 for not found
+            currentDrawChanged(index);
+        }
+        else
+        {
+            currentDrawChanged(0);
+        }
+    }
+    catch (VExceptionBadId &e)
+    {
+        e.CriticalMessageBox(tr("Bad id."), this);
+        Clear();
+        return;
+    }
+    catch (const VExceptionEmptyParameter &e)
+    {
+        e.CriticalMessageBox(tr("Error empty parameter."), this);
+        Clear();
+        return;
     }
 
     if (comboBoxDraws->count() > 0)
diff --git a/src/app/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp
index 1d09f48d4..733db56e3 100644
--- a/src/app/tools/vtooldetail.cpp
+++ b/src/app/tools/vtooldetail.cpp
@@ -458,7 +458,7 @@ void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     }
     if (selectedAction == actionRemove)
     {
-        DeleteTool(this);
+        DeleteTool();
     }
 }