lib/azeroth/decorator.rb in azeroth-0.6.4 vs lib/azeroth/decorator.rb in azeroth-0.6.5

@@ -255,9 +255,11 @@
     #
     # @param args [Hash] options (to be implemented)
     #
     # @return [Hash]
     def as_json(*args)
+      return nil if object.nil?
+
       return array_as_json(*args) if enum?
 
       HashBuilder.new(self).as_json
     end