diff --git a/internal/pkg/onuadaptercore/omci_ani_config.go b/internal/pkg/onuadaptercore/omci_ani_config.go
index 6b5457c..f724e0f 100644
--- a/internal/pkg/onuadaptercore/omci_ani_config.go
+++ b/internal/pkg/onuadaptercore/omci_ani_config.go
@@ -253,20 +253,23 @@
 							if meAttributes := oFsm.pOnuDB.GetMe(me.PriorityQueueClassID, mgmtEntityId); meAttributes != nil {
 								returnVal := meAttributes["RelatedPort"]
 								if returnVal != nil {
-									relatedPort := returnVal.(uint32)
-									if relatedPort == usQrelPortMask {
-										loGemPortAttribs.upQueueID = mgmtEntityId
-										logger.Debugw("UpQueue for GemPort found:", log.Fields{"gemPortID": loGemPortAttribs.gemPortID,
-											"upQueueID": strconv.FormatInt(int64(loGemPortAttribs.upQueueID), 16), "device-id": oFsm.pAdaptFsm.deviceID})
-										usQueueFound = true
-									} else if (relatedPort&0xFFFFFF) == dsQrelPortMask && mgmtEntityId < 0x8000 {
-										loGemPortAttribs.downQueueID = mgmtEntityId
-										logger.Debugw("DownQueue for GemPort found:", log.Fields{"gemPortID": loGemPortAttribs.gemPortID,
-											"downQueueID": strconv.FormatInt(int64(loGemPortAttribs.downQueueID), 16), "device-id": oFsm.pAdaptFsm.deviceID})
-										dsQueueFound = true
-									}
-									if usQueueFound && dsQueueFound {
-										break
+									if relatedPort, err := oFsm.pOnuDB.GetUint32Attrib(returnVal); err == nil {
+										if relatedPort == usQrelPortMask {
+											loGemPortAttribs.upQueueID = mgmtEntityId
+											logger.Debugw("UpQueue for GemPort found:", log.Fields{"gemPortID": loGemPortAttribs.gemPortID,
+												"upQueueID": strconv.FormatInt(int64(loGemPortAttribs.upQueueID), 16), "device-id": oFsm.pAdaptFsm.deviceID})
+											usQueueFound = true
+										} else if (relatedPort&0xFFFFFF) == dsQrelPortMask && mgmtEntityId < 0x8000 {
+											loGemPortAttribs.downQueueID = mgmtEntityId
+											logger.Debugw("DownQueue for GemPort found:", log.Fields{"gemPortID": loGemPortAttribs.gemPortID,
+												"downQueueID": strconv.FormatInt(int64(loGemPortAttribs.downQueueID), 16), "device-id": oFsm.pAdaptFsm.deviceID})
+											dsQueueFound = true
+										}
+										if usQueueFound && dsQueueFound {
+											break
+										}
+									} else {
+										logger.Warnw("Could not convert attribute value", log.Fields{"device-id": oFsm.pAdaptFsm.deviceID})
 									}
 								} else {
 									logger.Warnw("'relatedPort' not found in meAttributes:", log.Fields{"device-id": oFsm.pAdaptFsm.deviceID})
@@ -284,11 +287,12 @@
 					loGemPortAttribs.weight = gemEntry.queueWeight
 					loGemPortAttribs.pbitString = gemEntry.pbitString
 
-					logger.Debugw("prio-related GemPort attributes assigned:", log.Fields{
-						"gemPortID":   loGemPortAttribs.gemPortID,
-						"upQueueID":   loGemPortAttribs.upQueueID,
-						"downQueueID": loGemPortAttribs.downQueueID,
-						"pbitString":  loGemPortAttribs.pbitString,
+					logger.Debugw("prio-related GemPort attributes:", log.Fields{
+						"gemPortID":      loGemPortAttribs.gemPortID,
+						"upQueueID":      loGemPortAttribs.upQueueID,
+						"downQueueID":    loGemPortAttribs.downQueueID,
+						"pbitString":     loGemPortAttribs.pbitString,
+						"prioQueueIndex": gemEntry.prioQueueIndex,
 					})
 
 					oFsm.gemPortAttribsSlice = append(oFsm.gemPortAttribsSlice, loGemPortAttribs)
