diff --git a/internal/bbsim/devices/olt.go b/internal/bbsim/devices/olt.go
index bb5be2e..51c0f14 100644
--- a/internal/bbsim/devices/olt.go
+++ b/internal/bbsim/devices/olt.go
@@ -963,6 +963,7 @@
 			"IntfId": onu.IntfId,
 			"err":    err,
 		}).Error("Can't find PonPort")
+		return nil, err
 	}
 	_onu, err := pon.GetOnuById(onu.OnuId)
 	if err != nil {
@@ -971,6 +972,7 @@
 			"IntfId": onu.IntfId,
 			"err":    err,
 		}).Error("Can't find Onu")
+		return nil, err
 	}
 
 	if _onu.InternalState.Current() != OnuStateDisabled {