diff --git a/internal/pkg/onuadaptercore/device_handler.go b/internal/pkg/onuadaptercore/device_handler.go
index 4f0b030..21e72fc 100644
--- a/internal/pkg/onuadaptercore/device_handler.go
+++ b/internal/pkg/onuadaptercore/device_handler.go
@@ -432,8 +432,8 @@
 	var err error
 	err = errors.New("Device FSM: function not implemented yet!")
 	e.Cancel(err)
-	return
 	logger.Debug("doStateConnected-done")
+	return
 }
 
 // doStateUp handle the onu up indication and update to voltha core
@@ -443,8 +443,8 @@
 	var err error
 	err = errors.New("Device FSM: function not implemented yet!")
 	e.Cancel(err)
-	return
 	logger.Debug("doStateUp-done")
+	return
 
 	/*
 		// Synchronous call to update device state - this method is run in its own go routine
@@ -517,8 +517,8 @@
 	*/
 	err = errors.New("Device FSM: function not implemented yet!")
 	e.Cancel(err)
-	return
 	logger.Debug("doStateDown-done")
+	return
 }
 
 // DeviceHandler StateMachine related state transition methods ##### end #########