diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageProcessor.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageProcessor.java index 882398fca..759f6f204 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageProcessor.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageProcessor.java @@ -236,13 +236,13 @@ private void dispatch(IMessage message) processForFrequencyBands(message); //Also process the link control messages for frequency bands. - if(message instanceof LDU1Message ldu1) + if(message instanceof LDU1Message ldu1 && ldu1.getLinkControlWord() instanceof LinkControlWord lcw && lcw.isValid()) { - processForFrequencyBands(ldu1.getLinkControlWord()); + processForFrequencyBands(lcw); } - else if(message instanceof TDULCMessage tdulc) + else if(message instanceof TDULCMessage tdulc && tdulc.getLinkControlWord() instanceof LinkControlWord lcw && lcw.isValid()) { - processForFrequencyBands(tdulc.getLinkControlWord()); + processForFrequencyBands(lcw); } if(mMessageListener != null)