diff --git a/matrix.c b/matrix.c
index 685c857..c4de930 100644
--- a/matrix.c
+++ b/matrix.c
@@ -10,7 +10,7 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
     Matrix m;
     m.rows = rows;
     m.cols = cols;
-    m.data = NULL;
+    m.buffer = NULL;
  
     if(rows == 0 || cols == 0)
     {
@@ -18,11 +18,14 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
         exit(EXIT_FAILURE);
     }
  
-    m.data = calloc(rows * cols, sizeof(MatrixType));
-    if (m.data == NULL)
+    m.buffer = calloc(rows * cols, sizeof(MatrixType));
+    if (m.buffer == NULL)
     {
-        printf("Error");
-        exit(EXIT_FAILURE);
+        
+        m.rows = 0;
+        m.cols = 0;
+        m.buffer = NULL;
+        return m;
     }
  
     return m;
@@ -30,22 +33,22 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
 
 void clearMatrix(Matrix *matrix)
 {
-    free(matrix->data);
+    free(matrix->buffer);
     
     matrix->rows = 0;
     matrix->cols = 0;
-    matrix->data = NULL;
+    matrix->buffer = NULL;
 }
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
    
-  matrix.data[(rowIdx * matrix.cols) + colIdx] = value;   //wir setzen den data-Wert an der Stelle (rowIdx*Spalten + colIdx) auf den Wert von value
+  matrix.buffer[(rowIdx * matrix.cols) + colIdx] = value;   //wir setzen den data-Wert an der Stelle (rowIdx*Spalten + colIdx) auf den Wert von value
 }
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
-    return matrix.data[(rowIdx * matrix.cols) + colIdx];
+    return matrix.buffer[(rowIdx * matrix.cols) + colIdx];
 }
 
 static int can_add(Matrix matrix1, Matrix matrix2) {
@@ -101,7 +104,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) //wir addieren nur wenn b
     
         for(int i = 0; i < (matrix1.rows * matrix1.cols); i++)
 
-            matrix_erg.data[i] = matrix1.data[i] + matrix2.data[i];
+            matrix_erg.buffer[i] = matrix1.buffer[i] + matrix2.buffer[i];
             
         break;
 
@@ -110,7 +113,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) //wir addieren nur wenn b
         for(int i = 0; i < erg_rows; i++){
             for(int j = 0; j < erg_cols; j++)
 
-                matrix_erg.data[i * erg_cols + j] = matrix1.data[i * erg_cols + j] + matrix2.data[i];
+                matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[i * erg_cols + j] + matrix2.buffer[i];
         }
         break;
 
@@ -119,7 +122,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) //wir addieren nur wenn b
         for(int i = 0; i < erg_rows; i++){
             for(int j = 0; j < erg_cols; j++)
 
-                matrix_erg.data[i * erg_cols + j] = matrix1.data[i] + matrix2.data[i * erg_cols + j];
+                matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[i] + matrix2.buffer[i * erg_cols + j];
         }
         break;
 
@@ -128,7 +131,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) //wir addieren nur wenn b
         for(int i = 0; i < erg_rows; i++){
             for(int j = 0; j < erg_cols; j++)
 
-                matrix_erg.data[i * erg_cols + j] = matrix1.data[i * erg_cols + j] + matrix2.data[j];
+                matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[i * erg_cols + j] + matrix2.buffer[j];
         }
         break;
 
@@ -137,13 +140,16 @@ Matrix add(const Matrix matrix1, const Matrix matrix2) //wir addieren nur wenn b
         for(int i = 0; i < erg_rows; i++){
             for(int j = 0; j < erg_cols; j++)
 
-                matrix_erg.data[i * erg_cols + j] = matrix1.data[j] + matrix2.data[i * erg_cols + j];
+                matrix_erg.buffer[i * erg_cols + j] = matrix1.buffer[j] + matrix2.buffer[i * erg_cols + j];
         }
         break;
 
-    default: 
-        printf("Matrix addition not possible\n");
-        exit(EXIT_FAILURE);
+    default:
+        
+        matrix_erg.rows = 0;
+        matrix_erg.cols = 0;
+        matrix_erg.buffer = NULL;
+        return matrix_erg;
 
     
     }
@@ -183,10 +189,10 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
                 
                 for (int k = 0; k < matrix1.cols; k++)
                 {
-                    sum += matrix1.data[i * matrix1.cols + k] * matrix2.data[k * matrix2.cols + j];
+                    sum += matrix1.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j];
                 }
                 
-                matrix_erg.data [i * erg_cols + j] = sum;
+                matrix_erg.buffer [i * erg_cols + j] = sum;
             }
  
         }
@@ -195,7 +201,10 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
     }  
     else 
     {
-        printf("Matrix multiplication not possible\n");
-        exit(EXIT_FAILURE);
+        
+        matrix_erg.rows = 0;
+        matrix_erg.cols = 0;
+        matrix_erg.buffer = NULL;
+        return matrix_erg;
     }
 }
\ No newline at end of file
diff --git a/matrix.h b/matrix.h
index 1c52638..aa673ca 100644
--- a/matrix.h
+++ b/matrix.h
@@ -11,7 +11,7 @@ typedef struct
 {
     unsigned int rows;
     unsigned int cols;
-    MatrixType *data;
+    MatrixType *buffer;
 }Matrix;
 
 Matrix createMatrix(unsigned int rows, unsigned int cols);