Fixed NPE in options