diff --git a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
index 9d76db2e6..0a4c05d61 100644
--- a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
+++ b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
@@ -96,7 +96,9 @@ void QetGraphicsTableItem::checkInsufficientRowsCount(QetGraphicsTableItem *tabl
 
 	if (count_ < first_table->model()->rowCount())
 	{
-		QWidget *parent = first_table->diagram()->views().first() ? first_table->diagram()->views().first() : nullptr;
+		QWidget *parent = nullptr;
+		if (first_table->diagram() && first_table->diagram()->views().size())
+			parent = first_table->diagram()->views().first();
 
 		QString text;
 		if (several_table) {
diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp
index 1368c63d7..e30f1ac9f 100644
--- a/sources/qetproject.cpp
+++ b/sources/qetproject.cpp
@@ -1207,7 +1207,7 @@ void QETProject::readProjectXml(QDomDocument &xml_project)
 	
 		//The roots of the xml document must be a "project" element
 	if (root_elmt.tagName() == "project")
-	{
+	  {
 			//Normal opening mode
 		if (root_elmt.hasAttribute("version"))
 		{
@@ -1244,6 +1244,7 @@ void QETProject::readProjectXml(QDomDocument &xml_project)
 		m_state = ProjectParsingFailed;
 	}
 	
+	m_data_base.blockSignals(true);
 		//Load the project-wide properties
 	readProjectPropertiesXml(xml_project);
 		//Load the default properties for the new diagrams
@@ -1254,6 +1255,8 @@ void QETProject::readProjectXml(QDomDocument &xml_project)
 	readElementsCollectionXml(xml_project);
 		//Load the diagrams
 	readDiagramsXml(xml_project);
+	m_data_base.blockSignals(false);
+	m_data_base.updateDB();
 	
 	m_state = Ok;
 }