CRM-13738 related improvisation and notice fix

This PR holds the changes mentioned in https://github.com/civicrm/civicrm-core/pull/1980#issuecomment-28784042