diff --git a/src/main/java/io/github/dsheirer/alias/Alias.java b/src/main/java/io/github/dsheirer/alias/Alias.java index 2b75a1e1..53abb627 100644 --- a/src/main/java/io/github/dsheirer/alias/Alias.java +++ b/src/main/java/io/github/dsheirer/alias/Alias.java @@ -618,10 +618,14 @@ public class Alias for(AliasID id : getAliasIdentifiers()) { - if(id.getType() == AliasIDType.BROADCAST_CHANNEL && - ((BroadcastChannel)id).getChannelName().contentEquals(channel)) + if(id instanceof BroadcastChannel) { - return true; + BroadcastChannel broadcastChannel = (BroadcastChannel)id; + + if(broadcastChannel.getChannelName() != null && broadcastChannel.getChannelName().contentEquals(channel)) + { + return true; + } } }