diff --git a/src/mat.cc b/src/mat.cc
index 368f857..00e1f4e 100644
--- a/src/mat.cc
+++ b/src/mat.cc
@@ -83,17 +83,18 @@ namespace php_arma
                 break;
             }
             ZEND_HASH_FOREACH_VAL(Z_ARR_P(row), zval *elem)
-                if (idx_col > num_cols - 1) {
+                if (UNEXPECTED(idx_col > num_cols - 1)) {
                     break;
                 }
                 if (UNEXPECTED(!zval_check_scalar<T>(elem))) {
-                    break;
+                    goto end_loop;
                 }
                 native->at(idx_row, idx_col++) = zval_get_scalar<T>(elem);
             ZEND_HASH_FOREACH_END();
             ++idx_row;
             idx_col = 0;
         ZEND_HASH_FOREACH_END();
+        end_loop:
         RETVAL_OBJ(zobj);
     }
 
diff --git a/tests/003-mat-init.phpt b/tests/003-mat-init.phpt
index dd8136c..6c37d22 100644
--- a/tests/003-mat-init.phpt
+++ b/tests/003-mat-init.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for initialization of `Mat`
+Test for initialization of `Mat`.
 --SKIPIF--
 <?php
 require_once 'includes/loaded.php';