diff --git a/matrix.c b/matrix.c
index 32f3497..50e10ce 100644
--- a/matrix.c
+++ b/matrix.c
@@ -51,6 +51,11 @@ void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned
 
 MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
 {
+    if(matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols)
+    {
+        return UNDEFINED_MATRIX_VALUE;
+    }
+    
     return matrix.buffer[(rowIdx * matrix.cols) + colIdx];
 }