diff --git a/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java
index e14b22b6d..3b7881c3d 100644
--- a/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java
+++ b/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java
@@ -68,7 +68,9 @@ public class ConnectionListAction extends UpdateAction {
             }
 
             protected void renameConnection(String oldName, String newName) {
-                datasourceManager.renameConnection(oldName, newName);
+                if(datasourceManager.getConnection(oldName) != null){
+                    datasourceManager.renameConnection(oldName, newName);
+                }
             }
         };
         final BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null);
diff --git a/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java
index b723b9928..946fa61f5 100644
--- a/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java
+++ b/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java
@@ -78,7 +78,9 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
                 Configurations.update(new Worker() {
                     @Override
                     public void run() {
-                        tableDataConfig.renameTableData(oldName, newName);
+                        if(tableDataConfig.getTableData(oldName) != null){
+                            tableDataConfig.renameTableData(oldName, newName);
+                        }
                     }
 
                     @Override