CRM-13698-fix

this PR consists of 2 fixes, one is of the actual fix and other one is minor improvement after i encountered 'DB: no such table' error during upgrade check from 4.3.6 => 4.4.1 

----------------------------------------
* CRM-13698-fix:
  http://issues.civicrm.org/jira/browse/CRM-13698