diff --git a/lib/Doctrine/Connection/UnitOfWork.php b/lib/Doctrine/Connection/UnitOfWork.php index f16164dda..815cde4dc 100644 --- a/lib/Doctrine/Connection/UnitOfWork.php +++ b/lib/Doctrine/Connection/UnitOfWork.php @@ -193,7 +193,11 @@ class Doctrine_Connection_UnitOfWork extends Doctrine_Connection_Module if ($record->hasReference($alias)) { $obj = $record->$alias; - $obj->save($conn); + + // check that the related object is not Doctrine_Null + if ($obj instanceof Doctrine_Record) { + $obj->save($conn); + } } }