Fixing null options bug