diff --git a/DESCRIPTION b/DESCRIPTION
index d0c0aaed7..69bc60d04 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -8,7 +8,8 @@ Authors@R: c(
     person("Steffen", "Neumann", email="sneumann@ipb-halle.de", role=c("aut","cre")),
     person("Laurent", "Gatto", email="laurent.gatto@uclouvain.be", role=c("aut")),
     person("Qiakng", "Kou", email="qkou@umail.iu.edu", role=c("aut")),
-    person("David","Rauh",email="drauh@ipb-halle.de", role=c("ctb"))
+    person("David","Rauh",email="drauh@ipb-halle.de", role=c("ctb")),
+    person("Sascha","Manier",email="sascha.manier@uni-saarland.de", role=c("ctb"))
     )
 Description: mzR provides a unified API to the common file formats and
         parsers available for mass spectrometry data. It comes with a
diff --git a/src/pwiz/data/msdata/MSData.cpp b/src/pwiz/data/msdata/MSData.cpp
index 963bcb655..88c9589f5 100644
--- a/src/pwiz/data/msdata/MSData.cpp
+++ b/src/pwiz/data/msdata/MSData.cpp
@@ -1112,6 +1112,8 @@ PWIZ_API_DECL size_t SpectrumList::findAbbreviated(const string& abbreviatedId,
         if ((result >= 0 && result < size()) || s == 0)
             return result;
     }
+
+    return size();
 }