diff --git a/common/MovingAverage.cpp b/common/MovingAverage.cpp
index 3ab60805..70c2cd5c 100644
--- a/common/MovingAverage.cpp
+++ b/common/MovingAverage.cpp
@@ -4,7 +4,13 @@
 #include <cmath>
 #include "MovingAverage.h"
 
-MovingAverage::MovingAverage(size_t elems) : elems(elems) {}
+#include "JFJochException.h"
+
+MovingAverage::MovingAverage(size_t elems) : elems(elems) {
+    if (elems == 0)
+        throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Moving average size must be positive");
+
+}
 
 void MovingAverage::Add(float val) {
     std::unique_lock ul(m);