diff --git a/analyses/pluginMisc/EHS_1988_I265504.info b/analyses/pluginMisc/EHS_1988_I265504.info
index 05fb3b67462ebff8d571dda79a39c16254437207..0082d4978bdc8886a7f1089f274730c9e2734350 100644
--- a/analyses/pluginMisc/EHS_1988_I265504.info
+++ b/analyses/pluginMisc/EHS_1988_I265504.info
@@ -12,7 +12,7 @@ References:
 RunInfo:
    Inelastic interactions in CM frame, excluding slow protons in the lab. frame with p < 1.2~GeV/$c$
 NumEvents: 100000
-Beams: [[p+, p+], [pi+, p+], [k+, p+]]
+Beams: [[p+, p+], [211, p+], [321, p+]]
 Energies: [[250., 0.], [250., 0.], [250., 0.]]
 NeedCrossSection: True
 Description:
diff --git a/src/Core/AnalysisInfo.cc b/src/Core/AnalysisInfo.cc
index e55e4afbce53bef7cc67d393f9a92d57c30c3bb9..7d6a23306998e62ceea2146e19a65cfd576ea7fd 100644
--- a/src/Core/AnalysisInfo.cc
+++ b/src/Core/AnalysisInfo.cc
@@ -192,8 +192,11 @@ namespace Rivet {
     for ( auto opttag : _options ) {
       std::vector<std::string> optv = split(opttag, "=");
       std::string optname = optv[0];
-      for ( auto opt : split(optv[1], ",") )
-        _optionmap[optname].insert(opt);
+      if(optv.size()>1)
+        for ( auto opt : split(optv[1], ",") )
+          _optionmap[optname].insert(opt);
+      else
+        _optionmap[optname].insert("");
     }
   }