Undefined/null option hashes are now handled appropriately