diff --git a/templates/default/tmpl/exceptions.tmpl b/templates/default/tmpl/exceptions.tmpl
index 426c07be..6cce8fc6 100644
--- a/templates/default/tmpl/exceptions.tmpl
+++ b/templates/default/tmpl/exceptions.tmpl
@@ -4,13 +4,13 @@
 </div>
 <?js } ?>
 
-<?js if (data.type) {?>
+<?js if (data.type && data.type.names) {?>
 <dl>
 	<dt>
 		Type
 	</dt>
 	<dd>
-		<?js= self.partial('type.tmpl', data.type) ?>
+		<?js= self.partial('type.tmpl', data.type.names) ?>
 	</dd>
 </dl>
 <?js } ?>
\ No newline at end of file
diff --git a/templates/default/tmpl/method.tmpl b/templates/default/tmpl/method.tmpl
index 4f27c299..226f9040 100644
--- a/templates/default/tmpl/method.tmpl
+++ b/templates/default/tmpl/method.tmpl
@@ -14,11 +14,11 @@
     </div>
     <?js } ?>
 
-    <?js if (kind === 'event' && data.type) {?>
+    <?js if (kind === 'event' && data.type && data.type.names) {?>
         <h5>Type:</h5>
         <ul>
             <li>
-                <?js= self.partial('type.tmpl', data.type) ?>
+                <?js= self.partial('type.tmpl', data.type.names) ?>
             </li>
         </ul>
     <?js } ?>
diff --git a/templates/default/tmpl/params.tmpl b/templates/default/tmpl/params.tmpl
index 0c301e9a..420d99d0 100644
--- a/templates/default/tmpl/params.tmpl
+++ b/templates/default/tmpl/params.tmpl
@@ -72,8 +72,8 @@
             <?js } ?>
             
             <td class="type">
-            <?js if (param.type) {?>
-                <?js= self.partial('type.tmpl', param.type) ?>
+            <?js if (param.type && param.type.names) {?>
+                <?js= self.partial('type.tmpl', param.type.names) ?>
             <?js } ?>
             </td>
             
diff --git a/templates/default/tmpl/properties.tmpl b/templates/default/tmpl/properties.tmpl
index 2f5be2ab..0c700aba 100644
--- a/templates/default/tmpl/properties.tmpl
+++ b/templates/default/tmpl/properties.tmpl
@@ -72,8 +72,8 @@
             <?js } ?>
             
             <td class="type">
-            <?js if (prop.type) {?>
-                <?js= self.partial('type.tmpl', prop.type) ?>
+            <?js if (prop.type && prop.type.names) {?>
+                <?js= self.partial('type.tmpl', prop.type.names) ?>
             <?js } ?>
             </td>
             
diff --git a/templates/default/tmpl/returns.tmpl b/templates/default/tmpl/returns.tmpl
index cbcaf3a8..6edf0618 100644
--- a/templates/default/tmpl/returns.tmpl
+++ b/templates/default/tmpl/returns.tmpl
@@ -4,13 +4,13 @@
 </div>
 <?js } ?>
 
-<?js if (data.type) {?>
+<?js if (data.type && data.type.names) {?>
 <dl>
 	<dt>
 		Type
 	</dt>
 	<dd>
-		<?js= this.partial('type.tmpl', data.type) ?>
+		<?js= this.partial('type.tmpl', data.type.names) ?>
 	</dd>
 </dl>
 <?js } ?>
\ No newline at end of file
diff --git a/templates/default/tmpl/type.tmpl b/templates/default/tmpl/type.tmpl
index 781c1830..6c96d6b7 100644
--- a/templates/default/tmpl/type.tmpl
+++ b/templates/default/tmpl/type.tmpl
@@ -1,9 +1,6 @@
-<?js if (data.names) { ?>
-    <?js
-        var names = data.names,
-            self = this;
-        names.forEach(function(name, i) { ?>
-    <span class="param-type"><?js= self.linkto(name, self.htmlsafe(name)) ?></span>
-    <?js if (i < names.length-1) { ?>|<?js } ?>
-    <?js }); ?>
-<?js } ?>
\ No newline at end of file
+<?js
+    var self = this;
+    data.forEach(function(name, i) { ?>
+<span class="param-type"><?js= self.linkto(name, self.htmlsafe(name)) ?></span>
+<?js if (i < data.length-1) { ?>|<?js } ?>
+<?js }); ?>
\ No newline at end of file