diff --git a/zencoding.vim b/zencoding.vim
index 899221a..5ddeeab 100644
--- a/zencoding.vim
+++ b/zencoding.vim
@@ -880,10 +880,10 @@ endfunction
 function! s:zen_parseIntoTree(abbr, type)
   let abbr = a:abbr
   let type = a:type
-  if len(type) == 0 | let type = 'html' | endif
   if !has_key(s:zen_settings, type)
-    return { 'child': [] }
+    let type = 'html'
   endif
+  if len(type) == 0 | let type = 'html' | endif
 
   if has_key(s:zen_settings[type], 'indentation')
     let indent = s:zen_settings[type].indentation
@@ -1068,6 +1068,9 @@ function! s:zen_toString(...)
   else
     let type = ''
   endif
+  if !has_key(s:zen_settings, type)
+    let type = 'html'
+  endif
   if len(type) == 0 | let type = 'html' | endif
   if a:0 > 2
     let inline = a:3