lib/teacup/style.rb in teacup-0.3.12 vs lib/teacup/style.rb in teacup-1.0.0

@@ -58,10 +58,10 @@
         end
       end
 
       # now we can merge extends, and importing.  before merging, these will go
       # through the same process that we just finished on the local style
-      if stylesheet
+      if stylesheet && stylesheet.is_a?(Teacup::Stylesheet)
         stylesheet.imported_stylesheets.reverse.each do |stylesheet|
           imported_properties = stylesheet.query(self.stylename, target, orientation, seen)
           Teacup::merge_defaults! properties, imported_properties
         end