diff --git a/vendor/plugins/hobo/hobo/taglibs/core.dryml b/vendor/plugins/hobo/hobo/taglibs/core.dryml
index 5b37bc5..8c56fdb 100644
--- a/vendor/plugins/hobo/hobo/taglibs/core.dryml
+++ b/vendor/plugins/hobo/hobo/taglibs/core.dryml
@@ -21,7 +21,15 @@ For example, you might want to wrap an `<img>` tag in an `<a>` tag but only unde
 -->
 <def tag="wrap" attrs="tag, when, parameter">
   <% parameter ||= :default %>
-  <%= when_ ? send(tag, attributes, { parameter.to_sym => parameters[:default] }) : parameters.default %>
+  <%= if when_
+        if self.class.method_defined?(tag)
+          send(tag, attributes, { parameter.to_sym => parameters[:default] })
+        else
+          content_tag(tag, parameters.default, attributes)
+        end
+      else
+        parameters.default
+      end  %>
 </def>