Fixed bug where null options would produce an exception