diff --git a/workflow/engine/classes/class.groups.php b/workflow/engine/classes/class.groups.php
index 7253d5ff6..a1a7a0e00 100644
--- a/workflow/engine/classes/class.groups.php
+++ b/workflow/engine/classes/class.groups.php
@@ -104,7 +104,7 @@ class Groups
   {
     try {
       $oGrp = GroupUserPeer::retrieveByPk($GrpUid, $UsrUid);
-      if (get_class($oGrp) == 'GroupUser') {
+      if (is_object($oGrp) && get_class($oGrp) == 'GroupUser') {
         return true;
       } else {
         $oGrp = new GroupUser();
@@ -303,7 +303,7 @@ class Groups
   {
     try {
       $oGrp = GroupUserPeer::retrieveByPk($GrpUid, $UsrUid);
-      if (get_class($oGrp) == 'GroupUser') {
+      if (is_object($oGrp) && get_class($oGrp) == 'GroupUser') {
         return 1;
       } else {
         return 0;
diff --git a/workflow/engine/classes/class.propelTable.php b/workflow/engine/classes/class.propelTable.php
index e5885c7cc..ab14cec22 100644
--- a/workflow/engine/classes/class.propelTable.php
+++ b/workflow/engine/classes/class.propelTable.php
@@ -395,7 +395,7 @@ class propelTable
       if(is_object($value)){
         $value = '';
       }
-      $this->tpl->assign( "value" , (eregi('^[[:space:]]', $value) && (substr($fieldName,0,3)!="PRO"))? str_ireplace(" "," ",$htmlField):$htmlField );
+      $this->tpl->assign( "value" , (preg_match('^[[:space:]]^', $value) && (substr($fieldName,0,3)!="PRO"))? str_ireplace(" "," ",$htmlField):$htmlField );
     }
     return $this->fields[$r]['Type'];
   }
diff --git a/workflow/engine/classes/model/Application.php b/workflow/engine/classes/model/Application.php
index 69abc8d89..46349580d 100644
--- a/workflow/engine/classes/model/Application.php
+++ b/workflow/engine/classes/model/Application.php
@@ -284,7 +284,7 @@ class Application extends BaseApplication {
     $con = Propel::getConnection(ApplicationPeer::DATABASE_NAME);
     try {
       $oApplication = ApplicationPeer::retrieveByPk( $AppUid );
-      if ( get_class ($oApplication) == 'Application' ) {
+      if (is_object($oApplication) && get_class ($oApplication) == 'Application' ) {
         $aFields = $oApplication->toArray(BasePeer::TYPE_FIELDNAME);
         $this->fromArray ($aFields, BasePeer::TYPE_FIELDNAME );
         
@@ -393,7 +393,7 @@ class Application extends BaseApplication {
     try {
       $con->begin();
       $oApp = ApplicationPeer::retrieveByPK( $aData['APP_UID'] );
-      if ( get_class ($oApp) == 'Application' ) {
+      if (is_object($oApp) && get_class ($oApp) == 'Application' ) {
         $oApp->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
         if ($oApp->validate()) {
           if ( isset ( $aData['APP_TITLE'] ) )
diff --git a/workflow/engine/classes/model/CaseScheduler.php b/workflow/engine/classes/model/CaseScheduler.php
index 78979a132..d6e45bf78 100644
--- a/workflow/engine/classes/model/CaseScheduler.php
+++ b/workflow/engine/classes/model/CaseScheduler.php
@@ -863,7 +863,7 @@ class CaseScheduler extends BaseCaseScheduler {
   function Exists( $sUid ) {
     try {
       $oObj = CaseSchedulerPeer::retrieveByPk( $sUid );
-      return (get_class($oObj) == 'CaseScheduler');
+      return (is_object($oObj) && get_class($oObj) == 'CaseScheduler');
     }
     catch (Exception $oError) {
       throw($oError);
diff --git a/workflow/engine/classes/model/CaseTracker.php b/workflow/engine/classes/model/CaseTracker.php
index 2643465f9..003b484ef 100644
--- a/workflow/engine/classes/model/CaseTracker.php
+++ b/workflow/engine/classes/model/CaseTracker.php
@@ -112,7 +112,7 @@ class CaseTracker extends BaseCaseTracker {
   function caseTrackerExists ( $sUid ) {
     try {
       $oObj = CaseTrackerPeer::retrieveByPk($sUid);
-      return (get_class($oObj) == 'CaseTracker');
+      return (is_object($oObj) && get_class($oObj) == 'CaseTracker');
     }
     catch (Exception $oError) {
       throw($oError);
diff --git a/workflow/engine/classes/model/CaseTrackerObject.php b/workflow/engine/classes/model/CaseTrackerObject.php
index 94ffb12f8..92fa50373 100644
--- a/workflow/engine/classes/model/CaseTrackerObject.php
+++ b/workflow/engine/classes/model/CaseTrackerObject.php
@@ -100,7 +100,7 @@ class CaseTrackerObject extends BaseCaseTrackerObject {
     $oConnection = Propel::getConnection(CaseTrackerObjectPeer::DATABASE_NAME);   
     try { 
       $oCaseTobj = CaseTrackerObjectPeer::retrieveByPK($sCTOUID);
-      if (get_class($oCaseTobj) == 'CaseTrackerObject')
+      if (is_object($oCaseTobj) && get_class($oCaseTobj) == 'CaseTrackerObject')
       { 
         $oConnection->begin();                
         $iResult = $oCaseTobj->delete();
@@ -143,7 +143,7 @@ class CaseTrackerObject extends BaseCaseTrackerObject {
   function caseTrackerObjectExists ( $Uid ) {
     try {
       $oObj = CaseTrackerObjectPeer::retrieveByPk( $Uid );
-      if ( get_class ($oObj) == 'CaseTrackerObject' ) {
+      if (is_object($oObj) && get_class ($oObj) == 'CaseTrackerObject' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/Configuration.php b/workflow/engine/classes/model/Configuration.php
index 258266048..4f0f40dd4 100644
--- a/workflow/engine/classes/model/Configuration.php
+++ b/workflow/engine/classes/model/Configuration.php
@@ -140,6 +140,6 @@ class Configuration extends BaseConfiguration {
   public function exists($CfgUid, $ObjUid, $ProUid, $UsrUid, $AppUid)
   {
     $oRow = ConfigurationPeer::retrieveByPK( $CfgUid, $ObjUid, $ProUid, $UsrUid, $AppUid );
-    return ( get_class ($oRow) == 'Configuration' && $oRow != '');
+    return (is_object($oRow) &&  get_class ($oRow) == 'Configuration');
   }
 } // Configuration
diff --git a/workflow/engine/classes/model/Content.php b/workflow/engine/classes/model/Content.php
index 813bee8c6..83b2c9d09 100644
--- a/workflow/engine/classes/model/Content.php
+++ b/workflow/engine/classes/model/Content.php
@@ -246,7 +246,7 @@ class Content extends BaseContent {
   {
     try {
       $oPro = ContentPeer::retrieveByPk($ConCategory, $ConParent, $ConId, $ConLang);
-      if ( get_class ($oPro) == 'Content' ) {                                               
+      if (is_object($oPro) && get_class ($oPro) == 'Content' ) {
         return true;
       } else {
         return false;
diff --git a/workflow/engine/classes/model/DbSource.php b/workflow/engine/classes/model/DbSource.php
index 67ee7d37d..9278537af 100644
--- a/workflow/engine/classes/model/DbSource.php
+++ b/workflow/engine/classes/model/DbSource.php
@@ -105,7 +105,7 @@ class DbSource extends BaseDbSource
   function Exists ( $Uid ) {
     try {
       $oPro = DbSourcePeer::retrieveByPk( $Uid );
-      if ( get_class ($oPro) == 'DbSource' ) {                                               
+      if (is_object($oPro) && get_class ($oPro) == 'DbSource' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/Department.php b/workflow/engine/classes/model/Department.php
index 978f0c380..4edf3b107 100644
--- a/workflow/engine/classes/model/Department.php
+++ b/workflow/engine/classes/model/Department.php
@@ -192,7 +192,7 @@ protected $depo_title = '';
     try {
       $con->begin(); 
       $oPro = DepartmentPeer::retrieveByPK( $aData['DEP_UID'] );
-      if ( get_class ($oPro) == 'Department' ) { 
+      if (is_object($oPro) && get_class ($oPro) == 'Department' ) {
         $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
         if ($oPro->validate()) {
           if ( isset ( $aData['DEPO_TITLE'] ) )
@@ -251,7 +251,7 @@ protected $depo_title = '';
           $aFields['USR_UID'] = $aRow['USR_UID'];
           $aFields['DEP_UID'] = '';
           $oDepto = UsersPeer::retrieveByPk($aFields['USR_UID']);
-            if (get_class($oDepto) == 'UsersPeer') {
+            if (is_object($oDepto) && get_class($oDepto) == 'UsersPeer') {
                 return true;
             } else {
                 $oDepto = new Users();
@@ -290,7 +290,7 @@ protected $depo_title = '';
   function existsDepartment( $DepUid ) {
     $con = Propel::getConnection(DepartmentPeer::DATABASE_NAME);
     $oPro = DepartmentPeer::retrieveByPk( $DepUid );
-    if ( get_class ($oPro) == 'Department' ) {
+    if (is_object($oPro) && get_class ($oPro) == 'Department' ) {
       return true;
     }
     else {
@@ -301,7 +301,7 @@ protected $depo_title = '';
   function existsUserInDepartment( $depId, $userId ) {
     $con = Propel::getConnection(DepartmentPeer::DATABASE_NAME);
     $oUser = UsersPeer::retrieveByPk( $userId );
-    if ( get_class ($oUser) == 'Users' ) {
+    if (is_object($oUser) && get_class ($oUser) == 'Users' ) {
       if ( $oUser->getDepUid() == $depId )
         return true;
     }
@@ -313,7 +313,7 @@ protected $depo_title = '';
     $managerId = '';
     $depParent = '';
     $oDept = DepartmentPeer::retrieveByPk( $depId );
-    if ( get_class ($oDept) == 'Department' ) {
+    if (is_object($oDept) && get_class ($oDept) == 'Department' ) {
       $managerId = $oDept->getDepManager( );
       $depParent = $oDept->getDepParent( );
     }
@@ -331,10 +331,10 @@ protected $depo_title = '';
 
     // update manager's manager, getting the manager of PARENT DEPARTMENT in order to enable scalating
     $oUser = UsersPeer::retrieveByPk( $managerId );
-    if ( get_class ($oUser) == 'Users' ) {
+    if (is_object($oUser) && get_class ($oUser) == 'Users' ) {
       $oDept = DepartmentPeer::retrieveByPk( $depParent );
       $oUser->setUsrReportsTo( '' ); //by default no manager
-      if ( get_class ($oDept) == 'Department' ) {
+      if (is_object($oUser) && get_class ($oDept) == 'Department' ) {
         $managerParentId = $oDept->getDepManager( );
         if ( trim($managerParentId) != '' ) {
           $oUser->setUsrReportsTo( $managerParentId );
@@ -352,7 +352,7 @@ protected $depo_title = '';
     $oDataset->next();
     while ( $aRow = $oDataset->getRow() ) {
       $oUser = UsersPeer::retrieveByPk($aRow['DEP_MANAGER']);
-      if (get_class($oUser) == 'Users') {
+      if (is_object($oUser) && get_class($oUser) == 'Users') {
         $oUser->setUsrReportsTo ( $managerId );
         $oUser->save();
       }
@@ -366,7 +366,7 @@ protected $depo_title = '';
     try {
       //update the field in user table
       $oUser = UsersPeer::retrieveByPk( $userId );
-      if ( get_class ($oUser) == 'Users' ) {
+      if (is_object($oUser) && get_class ($oUser) == 'Users' ) {
         $oUser->setDepUid( $depId );
         $oUser->save();
       }
@@ -374,7 +374,7 @@ protected $depo_title = '';
       //if the user is a manager update Department Table
       if ( $manager ) {
         $oDept = DepartmentPeer::retrieveByPk( $depId );
-        if ( get_class ($oDept) == 'Department' ) {
+        if (is_object($oDept) && get_class ($oDept) == 'Department' ) {
           $oDept->setDepManager( $userId );
           $oDept->save();
         }
@@ -486,7 +486,7 @@ protected $depo_title = '';
     $aFields = array ('USR_UID'=> $UsrUid,'DEP_UID'=> '', 'USR_REPORTS_TO' => '');
     try {
       $oUser = UsersPeer::retrieveByPk( $UsrUid );
-      if ( get_class($oUser) == 'Users' ) {
+      if (is_object($oUser) && get_class($oUser) == 'Users' ) {
         //$oDepto = new Users();
         $oUser->setDepUid ( '');
         $oUser->setUsrReportsTo ( '');
diff --git a/workflow/engine/classes/model/Dynaform.php b/workflow/engine/classes/model/Dynaform.php
index d83e03d9b..12f5859b5 100644
--- a/workflow/engine/classes/model/Dynaform.php
+++ b/workflow/engine/classes/model/Dynaform.php
@@ -316,7 +316,7 @@ class Dynaform extends BaseDynaform {
     $con = Propel::getConnection(DynaformPeer::DATABASE_NAME);
     try {
       $oPro = DynaformPeer::retrieveByPk( $ProUid );
-      if ( get_class ($oPro) == 'Dynaform' ) {
+      if (is_object($oPro) && get_class ($oPro) == 'Dynaform' ) {
         $aFields = $oPro->toArray(BasePeer::TYPE_FIELDNAME);
         $this->fromArray ($aFields, BasePeer::TYPE_FIELDNAME );
         $aFields['DYN_TITLE']       = $oPro->getDynTitle();
@@ -346,7 +346,7 @@ class Dynaform extends BaseDynaform {
     try {
       $con->begin();
       $oPro = DynaformPeer::retrieveByPK( $aData['DYN_UID'] );
-      if ( get_class ($oPro) == 'Dynaform' ) {
+      if (is_object($oPro) && get_class ($oPro) == 'Dynaform' ) {
         $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
         if ($oPro->validate()) {
           if ( isset ( $aData['DYN_TITLE'] ) )
@@ -416,7 +416,7 @@ class Dynaform extends BaseDynaform {
   public function exists($DynUid)
   {
     $oPro = DynaformPeer::retrieveByPk( $DynUid );
-    return ( get_class ($oPro) == 'Dynaform' );
+    return (is_object($oPro) && get_class ($oPro) == 'Dynaform' );
   }
 
   /**
@@ -429,7 +429,7 @@ class Dynaform extends BaseDynaform {
     $con = Propel::getConnection(TaskPeer::DATABASE_NAME);
     try {
       $oDyn = DynaformPeer::retrieveByPk( $DynUid );
-      if ( get_class ($oDyn) == 'Dynaform' ) {
+      if (is_object($oDyn) && get_class ($oDyn) == 'Dynaform' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/FieldCondition.php b/workflow/engine/classes/model/FieldCondition.php
index fa9642581..de6254d9b 100644
--- a/workflow/engine/classes/model/FieldCondition.php
+++ b/workflow/engine/classes/model/FieldCondition.php
@@ -91,7 +91,7 @@ class FieldCondition extends BaseFieldCondition {
         try {
             if( isset($aData['FCD_UID']) && trim($aData['FCD_UID']) != '' ) {
                 $obj = FieldConditionPeer::retrieveByPk( $aData['FCD_UID'] );
-                if( get_class($obj) != 'FieldCondition') {
+                if(is_object($obj) && get_class($obj) != 'FieldCondition') {
                     $obj = new FieldCondition();
                 }
             } else {
@@ -335,7 +335,7 @@ class FieldCondition extends BaseFieldCondition {
     function Exists ( $sUid ) {
         try {
             $obj = FieldConditionPeer::retrieveByPk( $sUid );
-            return( get_class($obj) == 'FieldCondition') ;
+            return(is_object($obj) && get_class($obj) == 'FieldCondition') ;
         }
         catch (Exception $oError) {
             throw($oError);
diff --git a/workflow/engine/classes/model/ObjectPermission.php b/workflow/engine/classes/model/ObjectPermission.php
index 121186bb5..9fe799f6c 100644
--- a/workflow/engine/classes/model/ObjectPermission.php
+++ b/workflow/engine/classes/model/ObjectPermission.php
@@ -53,7 +53,7 @@ class ObjectPermission extends BaseObjectPermission {
   function Exists ( $Uid ) {
     try {
       $oPro = ObjectPermissionPeer::retrieveByPk( $Uid );
-      if ( get_class ($oPro) == 'ObjectPermission' ) {
+      if (is_object($oPro) && get_class ($oPro) == 'ObjectPermission' ) {
         return true;
       }
       else {
@@ -70,7 +70,7 @@ class ObjectPermission extends BaseObjectPermission {
     $con = Propel::getConnection(ObjectPermissionPeer::DATABASE_NAME);
     try {
       $oObjPer = ObjectPermissionPeer::retrieveByPK($Uid);
-      if (get_class($oObjPer) == 'ObjectPermission')
+      if (is_object($oObjPer) && get_class($oObjPer) == 'ObjectPermission')
       {
         $con->begin();
         $iResult = $oObjPer->delete();
diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php
index 2863134ae..e7828102c 100644
--- a/workflow/engine/classes/model/Process.php
+++ b/workflow/engine/classes/model/Process.php
@@ -240,7 +240,7 @@ class Process extends BaseProcess {
     $con = Propel::getConnection(ProcessPeer::DATABASE_NAME);
     try {
       $oPro = ProcessPeer::retrieveByPk( $ProUid );
-      if ( get_class ($oPro) == 'Process' ) {
+      if (is_object ($oPro) && get_class ($oPro) == 'Process' ) {
         $aFields = $oPro->toArray(BasePeer::TYPE_FIELDNAME);
         $this->fromArray ($aFields, BasePeer::TYPE_FIELDNAME );
         //optimized to avoid double and multiple execution of the same query
@@ -301,7 +301,7 @@ class Process extends BaseProcess {
         $aFields['PRO_CATEGORY_LABEL']=G::LoadTranslation("ID_PROCESS_NO_CATEGORY");        
         if($aFields['PRO_CATEGORY']!=""){        	
         	$oProCat = ProcessCategoryPeer::retrieveByPk( $aFields['PRO_CATEGORY'] );        	
-        	if ( get_class ($oProCat) == 'ProcessCategory' ) {
+        	if (is_object ($oProCat) && get_class ($oProCat) == 'ProcessCategory' ) {
         	$aFields['PRO_CATEGORY_LABEL']=$oProCat->getCategoryName();
         	}
         }        
@@ -336,7 +336,7 @@ class Process extends BaseProcess {
     try {
       $con->begin();
       $oPro = ProcessPeer::retrieveByPK( $aData['PRO_UID'] );
-      if ( get_class ($oPro) == 'Process' ) {
+      if (is_object ($oPro) && get_class ($oPro) == 'Process' ) {
         $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
         if ($oPro->validate()) {
           if ( isset ( $aData['PRO_TITLE'] ) )
@@ -454,7 +454,7 @@ class Process extends BaseProcess {
   public function exists($ProUid)
   {
     $oPro = ProcessPeer::retrieveByPk( $ProUid );
-    return ( get_class ($oPro) == 'Process' );
+    return (is_object ($oPro) && get_class ($oPro) == 'Process' );
   }
 
   //new functions
diff --git a/workflow/engine/classes/model/ProcessUser.php b/workflow/engine/classes/model/ProcessUser.php
index 1357f1135..d4815eb71 100644
--- a/workflow/engine/classes/model/ProcessUser.php
+++ b/workflow/engine/classes/model/ProcessUser.php
@@ -87,7 +87,7 @@ class ProcessUser extends BaseProcessUser {
   function Exists ( $sUid ) {
     try {
       $oObj = ProcessUserPeer::retrieveByPk($sUid);
-      return (get_class($oObj) == 'ProcessUser');
+      return (is_object($oObj) && get_class($oObj) == 'ProcessUser');
     }
     catch (Exception $oError) {
       throw($oError);
diff --git a/workflow/engine/classes/model/ReportTable.php b/workflow/engine/classes/model/ReportTable.php
index 3c81974f2..0687ba117 100644
--- a/workflow/engine/classes/model/ReportTable.php
+++ b/workflow/engine/classes/model/ReportTable.php
@@ -205,7 +205,7 @@ class ReportTable extends BaseReportTable {
     $con = Propel::getConnection(ReportTablePeer::DATABASE_NAME);
     try {
       $oRepTabUid = ReportTablePeer::retrieveByPk( $RepTabUid );
-      if ( get_class ($oRepTabUid) == 'ReportTable' ) {
+      if (is_object($oRepTabUid) && get_class ($oRepTabUid) == 'ReportTable' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/Route.php b/workflow/engine/classes/model/Route.php
index eba4b0897..72d3cadd2 100644
--- a/workflow/engine/classes/model/Route.php
+++ b/workflow/engine/classes/model/Route.php
@@ -166,7 +166,7 @@ class Route extends BaseRoute {
     $con = Propel::getConnection(RoutePeer::DATABASE_NAME);
     try {
       $oRouUid = RoutePeer::retrieveByPk( $sRouUid );
-      if ( get_class ($oRouUid) == 'Route' ) {
+      if (is_object($oRouUid) && get_class ($oRouUid) == 'Route' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/Stage.php b/workflow/engine/classes/model/Stage.php
index 33c543a3c..c40e7a91e 100644
--- a/workflow/engine/classes/model/Stage.php
+++ b/workflow/engine/classes/model/Stage.php
@@ -187,7 +187,7 @@ class Stage extends BaseStage {
   function Exists ( $sUid ) {
     try {
       $oObj = StagePeer::retrieveByPk($sUid);
-      return (get_class($oObj) == 'Stage');
+      return (is_object($oObj) && get_class($oObj) == 'Stage');
     }
     catch (Exception $oError) {
       throw($oError);
diff --git a/workflow/engine/classes/model/Step.php b/workflow/engine/classes/model/Step.php
index 6dc0b1800..9d7e70642 100644
--- a/workflow/engine/classes/model/Step.php
+++ b/workflow/engine/classes/model/Step.php
@@ -368,7 +368,7 @@ class Step extends BaseStep {
     $con = Propel::getConnection(StepPeer::DATABASE_NAME);
     try {
       $oObj = StepPeer::retrieveByPk( $sUid );
-      if ( get_class ($oObj) == 'Step' ) {
+      if (is_object($oObj) && get_class ($oObj) == 'Step' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/StepSupervisor.php b/workflow/engine/classes/model/StepSupervisor.php
index 00b1e7af5..3eb88f393 100644
--- a/workflow/engine/classes/model/StepSupervisor.php
+++ b/workflow/engine/classes/model/StepSupervisor.php
@@ -39,7 +39,7 @@ class StepSupervisor extends BaseStepSupervisor {
   function Exists ( $Uid ) {
     try {
       $oPro = StepSupervisorPeer::retrieveByPk( $Uid );
-      if ( get_class ($oPro) == 'StepSupervisor' ) {
+      if (is_object($oPro) && get_class ($oPro) == 'StepSupervisor' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/StepTrigger.php b/workflow/engine/classes/model/StepTrigger.php
index 112cf4dee..b11800c05 100644
--- a/workflow/engine/classes/model/StepTrigger.php
+++ b/workflow/engine/classes/model/StepTrigger.php
@@ -152,7 +152,7 @@ class StepTrigger extends BaseStepTrigger {
     $con = Propel::getConnection(StepTriggerPeer::DATABASE_NAME);
     try {
       $oObj = StepTriggerPeer::retrieveByPk($StepUid, $TasUid, $TriUid, $StType);
-      if ( get_class ($oObj) == 'StepTrigger' ) {
+      if (is_object($oObj) && get_class ($oObj) == 'StepTrigger' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/SubProcess.php b/workflow/engine/classes/model/SubProcess.php
index 7616764c5..637d795ff 100644
--- a/workflow/engine/classes/model/SubProcess.php
+++ b/workflow/engine/classes/model/SubProcess.php
@@ -147,7 +147,7 @@ class SubProcess extends BaseSubProcess {
     $con = Propel::getConnection(SubProcessPeer::DATABASE_NAME);
     try {
       $oObj = SubProcessPeer::retrieveByPk( $sUid );
-      if ( get_class ($oObj) == 'SubProcess' ) {
+      if (is_object($oObj) && get_class ($oObj) == 'SubProcess' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/Task.php b/workflow/engine/classes/model/Task.php
index 350b6fe7c..cafa752df 100644
--- a/workflow/engine/classes/model/Task.php
+++ b/workflow/engine/classes/model/Task.php
@@ -500,7 +500,7 @@ public function kgetassigType($pro_uid, $tas){
     $con = Propel::getConnection(TaskPeer::DATABASE_NAME);
     try {
       $oPro = TaskPeer::retrieveByPk( $TasUid );
-      if ( get_class ($oPro) == 'Task' ) {
+      if ( is_object($oPro) && get_class ($oPro) == 'Task' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/TaskUser.php b/workflow/engine/classes/model/TaskUser.php
index d8f71de77..74db7a0ad 100644
--- a/workflow/engine/classes/model/TaskUser.php
+++ b/workflow/engine/classes/model/TaskUser.php
@@ -117,7 +117,7 @@ class TaskUser extends BaseTaskUser {
     $con = Propel::getConnection(TaskUserPeer::DATABASE_NAME);
     try {
       $oTaskUser = TaskUserPeer::retrieveByPk($sTasUid, $sUserUid, $iType, $iRelation);
-      if ( get_class ($oTaskUser) == 'TaskUser' ) {
+      if ( is_object($oTaskUser) && get_class ($oTaskUser) == 'TaskUser' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/Triggers.php b/workflow/engine/classes/model/Triggers.php
index c6cd25685..4aa4c30fc 100644
--- a/workflow/engine/classes/model/Triggers.php
+++ b/workflow/engine/classes/model/Triggers.php
@@ -255,7 +255,7 @@ class Triggers extends BaseTriggers {
     $con = Propel::getConnection(TriggersPeer::DATABASE_NAME);
     try {
       $oObj = TriggersPeer::retrieveByPk( $sUid );
-      if ( get_class ($oObj) == 'Triggers' ) {
+      if (is_object($oObj) && get_class ($oObj) == 'Triggers' ) {
         return true;
       }
       else {
diff --git a/workflow/engine/classes/model/UsersProperties.php b/workflow/engine/classes/model/UsersProperties.php
index e95f417ef..632204b5b 100644
--- a/workflow/engine/classes/model/UsersProperties.php
+++ b/workflow/engine/classes/model/UsersProperties.php
@@ -20,7 +20,7 @@ class UsersProperties extends BaseUsersProperties {
       $oUserProperty = UsersPropertiesPeer::retrieveByPk($sUserUID);
       var_dump($oUserProperty);
       var_dump($sUserUID);
-      if (get_class($oUserProperty) == 'UsersProperties' && $oUserProperty != '') {
+      if (is_object($oUserProperty) && get_class($oUserProperty) == 'UsersProperties') {
           echo"inside";
         return true;
       }
diff --git a/workflow/engine/methods/users/myInfo.php b/workflow/engine/methods/users/myInfo.php
index 283226ea7..beac8fe17 100644
--- a/workflow/engine/methods/users/myInfo.php
+++ b/workflow/engine/methods/users/myInfo.php
@@ -63,7 +63,7 @@ try {
   //getting the user and department
   $oDepInfo = new Department();
   $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
-  if ( get_class ($oUser) == 'Users' ) {
+  if ( is_object($oUser) && get_class ($oUser) == 'Users' ) {
     $userFields = $oUser->toArray(BasePeer::TYPE_FIELDNAME);
     $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
     try {
diff --git a/workflow/engine/methods/users/myInfo_Edit.php b/workflow/engine/methods/users/myInfo_Edit.php
index b452d4b56..265f0dd56 100755
--- a/workflow/engine/methods/users/myInfo_Edit.php
+++ b/workflow/engine/methods/users/myInfo_Edit.php
@@ -52,7 +52,7 @@ try {
   //getting the user and department
   $oDepInfo = new Department();
   $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
-  if ( get_class ($oUser) == 'Users' ) {
+  if (is_object($oUser) && get_class ($oUser) == 'Users' ) {
     $userFields = $oUser->toArray(BasePeer::TYPE_FIELDNAME);
     $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];
     try {
diff --git a/workflow/engine/methods/users/users_Edit.php b/workflow/engine/methods/users/users_Edit.php
index 694aea025..1b2f35e1b 100644
--- a/workflow/engine/methods/users/users_Edit.php
+++ b/workflow/engine/methods/users/users_Edit.php
@@ -57,6 +57,7 @@ try {
   //getting the user and department
   $oDepInfo = new Department();
   $oUser = UsersPeer::retrieveByPk( $aFields['USR_REPORTS_TO'] );
+  if ($oUser != '')
   if ( get_class ($oUser) == 'Users' ) {
     $userFields = $oUser->toArray(BasePeer::TYPE_FIELDNAME);
     $aFields['USR_REPORTS_TO'] = $userFields['USR_FIRSTNAME'] . ' ' . $userFields['USR_LASTNAME'];