diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/APCO25Channel.java b/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/APCO25Channel.java
index 17fe2b741..2ab7209e4 100644
--- a/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/APCO25Channel.java
+++ b/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/APCO25Channel.java
@@ -135,7 +135,12 @@ public APCO25Channel decorateAs(int requestedTimeslot)
         }
 
         P25Channel decoratedChannel = new P25Channel(existing.getBandIdentifier(), channelNumber);
-        decoratedChannel.setFrequencyBand(existing.getFrequencyBand());
+
+        if(existing.getFrequencyBand() != null)
+        {
+            decoratedChannel.setFrequencyBand(existing.getFrequencyBand());
+        }
+
         return new APCO25Channel(decoratedChannel);
     }
 
diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25Channel.java b/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25Channel.java
index 90c582b19..9d3ea6167 100644
--- a/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25Channel.java
+++ b/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25Channel.java
@@ -134,7 +134,7 @@ public int[] getFrequencyBandIdentifiers()
     @Override
     public void setFrequencyBand(IFrequencyBand frequencyBand)
     {
-        if(frequencyBand.getIdentifier() == getDownlinkBandIdentifier())
+        if(frequencyBand != null && frequencyBand.getIdentifier() == getDownlinkBandIdentifier())
         {
             mFrequencyBand = frequencyBand;
         }