diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/template/TemplateApplyPanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/template/TemplateApplyPanel.java
index 49490fd..69690cc 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/template/TemplateApplyPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/template/TemplateApplyPanel.java
@@ -211,24 +211,22 @@ public class TemplateApplyPanel extends FramedPanel {
 
 	}
 
-	/*protected void setMenu() {
-		Menu contextMenu = new Menu();
-
-		MenuItem deleteTemplateItem = new MenuItem("Delete");
-		deleteTemplateItem.setId("DeleteTemplate");
-		deleteTemplateItem.setIcon(ResourceBundle.INSTANCE.removeTemplate());
-		deleteTemplateItem.addSelectionHandler(new SelectionHandler<Item>() {
-
-			@Override
-			public void onSelection(SelectionEvent<Item> event) {
-				Log.debug("Delete Template");
-				TemplateData templateDesc = getSelectedItem();
-
-			}
-		});
-
-		grid.setContextMenu(contextMenu);
-	}*/
+	/*
+	 * protected void setMenu() { Menu contextMenu = new Menu();
+	 * 
+	 * MenuItem deleteTemplateItem = new MenuItem("Delete");
+	 * deleteTemplateItem.setId("DeleteTemplate");
+	 * deleteTemplateItem.setIcon(ResourceBundle.INSTANCE.removeTemplate());
+	 * deleteTemplateItem.addSelectionHandler(new SelectionHandler<Item>() {
+	 * 
+	 * @Override public void onSelection(SelectionEvent<Item> event) {
+	 * Log.debug("Delete Template"); TemplateData templateDesc =
+	 * getSelectedItem();
+	 * 
+	 * } });
+	 * 
+	 * grid.setContextMenu(contextMenu); }
+	 */
 
 	protected TemplateData getSelectedItem() {
 		return grid.getSelectionModel().getSelectedItem();
@@ -236,11 +234,15 @@ public class TemplateApplyPanel extends FramedPanel {
 
 	protected void apply() {
 		templateApplySession = new TemplateApplySession();
-		templateApplySession.setTemplateData(getSelectedItem());
-		templateApplySession.setTrId(trId);
-		Log.debug("applyTemplateSession: " + templateApplySession);
-		parent.applyTemplate(templateApplySession);
-
+		TemplateData template = getSelectedItem();
+		if (template == null) {
+			UtilsGXT3.info("Attention", "Select the template to apply");
+		} else {
+			templateApplySession.setTemplateData(getSelectedItem());
+			templateApplySession.setTrId(trId);
+			Log.debug("applyTemplateSession: " + templateApplySession);
+			parent.applyTemplate(templateApplySession);
+		}
 	}
 
 	protected void close() {
diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/template/TemplateDeletePanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/template/TemplateDeletePanel.java
index f649cac..ce49243 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/template/TemplateDeletePanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/template/TemplateDeletePanel.java
@@ -237,10 +237,17 @@ public class TemplateDeletePanel extends FramedPanel {
 
 	protected void delete() {
 		templateDeleteSession = new TemplateDeleteSession();
-		templateDeleteSession.setTemplates(getSelectedItem());
-		Log.debug("templateDeleteSession: " + templateDeleteSession);
-		parent.templatesDelete(templateDeleteSession);
+		ArrayList<TemplateData> templates=getSelectedItem();
+		if(templates==null|| templates.size()==0){
+			UtilsGXT3.info("Attention",
+					"Select the template to be deleted");
+		} else {
+			templateDeleteSession.setTemplates(getSelectedItem());
+			Log.debug("templateDeleteSession: " + templateDeleteSession);
+			parent.templatesDelete(templateDeleteSession);
 
+		}
+		
 	}
 
 	protected void close() {