diff --git a/src/DataSet/DataSet.cpp b/src/DataSet/DataSet.cpp
index 08b4ffc2e4163f6191b24d717e11950300e51760..2a1eee4630bbff00fce0aaee29cd1d8fe6ebfe88 100644
--- a/src/DataSet/DataSet.cpp
+++ b/src/DataSet/DataSet.cpp
@@ -108,7 +108,15 @@ namespace lib4neuro {
                                 "is of different dimensionality!");
         }
 
-        double frac = (upper_bound - lower_bound) / (size - 1);
+        double frac;
+        if(size < 1) {
+            THROW_INVALID_ARGUMENT_ERROR("Size of added data has to be >=1 !");
+        } else if (size == 1) {
+            frac = 1;
+        } else {
+            frac = (upper_bound - lower_bound) / (size - 1);
+        }
+
         std::vector<double> inp, out;
 
         out = {output};
@@ -128,9 +136,17 @@ namespace lib4neuro {
         std::vector<std::vector<double>> grid;
         std::vector<double> tmp;
         double frac;
+        if(no_elems_in_one_dim < 1) {
+            THROW_INVALID_ARGUMENT_ERROR("Number of elements in one dimension has to be >=1 !");
+        }
 
         for (unsigned int i = 0; i < bounds.size(); i += 2) {
-            frac = (bounds[i] + bounds[i + 1]) / (no_elems_in_one_dim - 1);
+             if (no_elems_in_one_dim == 1) {
+                frac = 1;
+            } else {
+                frac = (bounds[i] - bounds[i+1]) / (no_elems_in_one_dim - 1);
+            }
+
             tmp.clear();
             for (double j = bounds[i]; j <= bounds[i + 1]; j += frac) {
                 tmp.emplace_back(j);
diff --git a/src/DataSet/DataSet.h b/src/DataSet/DataSet.h
index 52ed4e74ea0664ec78bcaeb5aa8dacbed3baf63d..056b67cc279542ace4978b26a3c30169137a262a 100644
--- a/src/DataSet/DataSet.h
+++ b/src/DataSet/DataSet.h
@@ -94,7 +94,7 @@ namespace lib4neuro {
          * Constructor for an empty DataSet
          */
         LIB4NEURO_API DataSet();
-
+        
         /**
          * Constructor reading data from the file
          * @param file_path Path to the file with stored data set