diff --git a/src/graph/GraphView.cpp b/src/graph/GraphView.cpp
index 328842cdee7a8caa278ee5a43727dd81964e1d91..a5bc01878b7dbf056b44e15b916d616d58741f35 100644
--- a/src/graph/GraphView.cpp
+++ b/src/graph/GraphView.cpp
@@ -291,11 +291,13 @@ void Aidge::GraphView::forwardDims() {
                         nodePtr->getOperator()->associateInput(i, inputI.first->getOperator()->getRawOutput(inputI.second));
                     }
                     else {
-                        assert(false && "Non-tensor entries not handled yet.\n");
+                        AIDGE_ASSERT(false, "Non-tensor entries not handled yet.\n");
                     }
                 }
             } else {
-                assert(!std::static_pointer_cast<Tensor>(nodePtr->getOperator()->getRawInput(i))->empty());
+                AIDGE_ASSERT(nodePtr->getOperator()->getRawInput(i)
+                    && !std::static_pointer_cast<Tensor>(nodePtr->getOperator()->getRawInput(i))->empty(), 
+                  "Missing input#{} for node {} ({})", i, nodePtr->name(), nodePtr->type());
             }
 
         }