diff --git a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java
index f332ef0..b715987 100644
--- a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java
@@ -48,6 +48,7 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard
 	private HtmlLayoutContainer resultField;
 	private boolean automaticallyAttached;
 	private TRId collateralTRId;
+	private MonitorDialog monitorDialog;
 
 	public ExtractCodelistOperationInProgressCard(
 			final ExtractCodelistSession extractCodelistSession) {
@@ -89,6 +90,7 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard
 							showErrorAndHide("Error in extract codelist",
 									"An error occured in extract codelist.",
 									caught.getLocalizedMessage(), caught);
+							return;
 						}
 					}
 				});
@@ -96,17 +98,24 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard
 
 	public void setCollateralTRIdFinal(ArrayList<TRId> collateralIds) {
 		if (collateralIds == null || collateralIds.isEmpty()) {
+			monitorDialog.hide();
 			showErrorAndHide("Error in extract codelist",
 					"An error occured setting collateral table final.",
 					"No collateral id retrieved", new Throwable(
 							"No collateral id retrieved"));
+			
+			return;
+			
 		}
 		collateralTRId = collateralIds.get(0);
 		if (collateralTRId == null) {
+			monitorDialog.hide();
 			showErrorAndHide("Error in extract codelist",
 					"An error occured setting collateral table final.",
 					"Collateral id is null", new Throwable(
 							"Collateral id is null"));
+			
+			return;
 		}
 
 		TDGWTServiceAsync.INSTANCE.setTabResourceToFinal(collateralTRId,
@@ -268,7 +277,7 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard
 
 	//
 	protected void openMonitorDialog(String taskId) {
-		MonitorDialog monitorDialog = new MonitorDialog(taskId, getEventBus());
+		monitorDialog = new MonitorDialog(taskId, getEventBus());
 		monitorDialog.addProgressDialogListener(this);
 		monitorDialog.setBackgroundBtnEnabled(false);
 		monitorDialog.show();