Fixing the OptionsHolder to be able to search for options
Avoiding NPEs in OptionsHolders when there is no option