Fixed null options checking