diff --git a/storage/inchi/src/main/java/org/openscience/cdk/inchi/InChIGeneratorFactory.java b/storage/inchi/src/main/java/org/openscience/cdk/inchi/InChIGeneratorFactory.java
index abfa1890066..9325c7a7df6 100644
--- a/storage/inchi/src/main/java/org/openscience/cdk/inchi/InChIGeneratorFactory.java
+++ b/storage/inchi/src/main/java/org/openscience/cdk/inchi/InChIGeneratorFactory.java
@@ -168,6 +168,7 @@ public InChIGenerator getInChIGenerator(IAtomContainer container, String options
      * @throws CDKException  if the generator cannot be instantiated
      */
     public InChIGenerator getInChIGenerator(IAtomContainer container, List<INCHI_OPTION> options) throws CDKException {
+        if (options == null) throw new IllegalArgumentException("Null options");
         return (new InChIGenerator(container, options, ignoreAromaticBonds));
     }