Regression: Searching for issues with invalid cascadingSelect option gives 500

com.atlassian.jira.issue.customfields.impl.FieldValidationException: '10001' is an invalid Option
	at com.atlassian.jira.issue.customfields.impl.CascadingSelectCFType.getOptionFromStringValue(CascadingSelectCFType.java:484)
	at com.atlassian.jira.issue.customfields.impl.CascadingSelectCFType.extractOptionFromParams(CascadingSelectCFType.java:464)
	at com.atlassian.jira.issue.customfields.impl.CascadingSelectCFType.getOptionMapFromCustomFieldParams(CascadingSelectCFType.java:442)
	at com.atlassian.jira.issue.customfields.impl.CascadingSelectCFType.getValueFromCustomFieldParams(CascadingSelectCFType.java:334)
	at com.atlassian.jira.issue.customfields.impl.CascadingSelectCFType.getValueFromCustomFieldParams(CascadingSelectCFType.java:69)
	at com.atlassian.jira.issue.customfields.DefaultCustomFieldValueProvider.getValue(DefaultCustomFieldValueProvider.java:23)
	at com.atlassian.jira.plugin.customfield.CustomFieldSearcherModuleDescriptorImpl.getViewHtml(CustomFieldSearcherModuleDescriptorImpl.java:110)
	at com.atlassian.jira.issue.customfields.searchers.renderer.CustomFieldRenderer.getViewHtml(CustomFieldRenderer.java:91)
	at com.atlassian.jira.issue.customfields.searchers.renderer.CustomFieldRenderer.getViewHtml(CustomFieldRenderer.java:65)
	at com.atlassian.jira.plugin.issuenav.service.DefaultSearcherService.getValueResults(DefaultSearcherService.java:243)
	at com.atlassian.jira.plugin.issuenav.service.DefaultSearcherService.getSearchResults(DefaultSearcherService.java:172)
	at com.atlassian.jira.plugin.issuenav.service.DefaultSearcherService.searchWithJql(DefaultSearcherService.java:166)
	at com.atlassian.jira.plugin.issuenav.IssueNavAction.performSearch(IssueNavAction.java:727)
	at com.atlassian.jira.plugin.issuenav.IssueNavAction.doNav(IssueNavAction.java:224)
	at com.atlassian.jira.plugin.issuenav.IssueNavAction.doDefault(IssueNavAction.java:151)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
	at java.lang.reflect.Method.invoke(Method.java:597)
	at webwork.util.InjectionUtils$DefaultInjectionImpl.invoke(InjectionUtils.java:70)
	at webwork.util.InjectionUtils.invoke(InjectionUtils.java:56)
	at webwork.action.ActionSupport.invokeCommand(ActionSupport.java:433)
	at webwork.action.ActionSupport.execute(ActionSupport.java:157)
	at com.atlassian.jira.action.JiraActionSupport.execute(JiraActionSupport.java:82)