diff --git a/matrix.c b/matrix.c
index 59d2458..3e5fa96 100644
--- a/matrix.c
+++ b/matrix.c
@@ -7,12 +7,15 @@
 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
-    Matrix m;
-    m.rows = rows;
-    m.cols = cols;
-    /* calloc initialisiert den Speicher mit 0 */
-    m.buffer = (MatrixType*)calloc(rows * cols, sizeof(MatrixType));
-    return m;
+    Matrix m = {NULL,0,0};
+    if (rows > 0 && cols > 0) {
+        m.rows = rows;
+        m.cols = cols;
+        /* calloc initialisiert den Speicher mit 0 */
+        m.buffer = (MatrixType*)calloc(rows * cols, sizeof(MatrixType));
+    }
+        return m;
+
 }
 
 void clearMatrix(Matrix *matrix)