Fixed segfault on options update in 2110 diff