lib/draftsman/model.rb in draftsman-0.3.3 vs lib/draftsman/model.rb in draftsman-0.3.4

@@ -257,14 +257,15 @@
           dependent_associations = self.class.reflect_on_all_associations(:has_one) + self.class.reflect_on_all_associations(:has_many)
 
           dependent_associations.each do |association|
 
             if association.klass.draftable? && association.options.has_key?(:dependent) && association.options[:dependent] == :destroy
-              dependents = association.macro == :has_one ? [self.send(association.name)] : self.send(association.name)
+              dependents = self.send(association.name)
+              dependents = [dependents] if (dependents && association.macro == :has_one)
 
               dependents.each do |dependent|
                 dependent.draft_destroy unless dependent.draft? && dependent.send(dependent.class.draft_association_name).destroy?
-              end
+              end if dependents
             end
           end
         end
       end