--- ECHO_content/ECHO_collection.py	2004/05/28 15:01:43	1.95
+++ ECHO_content/ECHO_collection.py	2004/06/05 10:04:33	1.97
@@ -88,11 +88,11 @@ def content_html(self,type):
         #
         #if templates:
         #    return templates[0][1]()
-
-        try:
+	
+        if hasattr(self,type+"_template"):
             obj=getattr(self,type+"_template")
             return obj()
-        except:
+        else:
             pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_%s_template_standard.zpt'%type).__of__(self)
             pt.content_type="text/html"
             return pt()
@@ -445,8 +445,8 @@ class ECHO_resource(Folder,Persistent):
 
     def getCopyright(self):
 	    """gib link auf copyright notiz aus"""
-	    if hasattr(self,'copyrightType'):
-		    obj=getattr(self.copyrightTypes,'copyrightType')
+	    if hasattr(self,'copyrightType') and hasattr(self.copyrightTypes,self.copyrightType):
+		    obj=getattr(self.copyrightTypes,self.copyrightType)
 	    else:
 		    obj=getattr(self.copyrightTypes,'generic')