CRM-13704 - Fatal error prevents deletion of options from custom fields

http://issues.civicrm.org/jira/browse/CRM-13704
Merge pull request #1906 from dlobo/CRM-13704

CRM-13704 - Fatal error prevents deletion of options from custom fields