1 files changed, 6 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/Application/Node.java b/java/src/IceGridGUI/Application/Node.java
index 61186757b72..a40ea616724 100644
--- a/java/src/IceGridGUI/Application/Node.java
+++ b/java/src/IceGridGUI/Application/Node.java
@@ -542,8 +542,12 @@ class Node extends TreeNode implements PropertySetParent
         //
         TemplateDescriptor templateDescriptor = root.findServerTemplateDescriptor(instanceDescriptor.template);
 
-        assert templateDescriptor != null;
-
+	if(templateDescriptor == null)
+	{
+	    throw new UpdateFailedException("Cannot find template descriptor '" +
+					    instanceDescriptor.template + 
+					    "' referenced by server-instance");
+	}
         ServerDescriptor serverDescriptor = (ServerDescriptor)templateDescriptor.descriptor;
 
         assert serverDescriptor != null;