Avoid passing empty options, and defend against it if we do