diff --git a/src/module/decode/state/ChannelPanel.java b/src/module/decode/state/ChannelPanel.java
index 0d88f826..5dee9814 100644
--- a/src/module/decode/state/ChannelPanel.java
+++ b/src/module/decode/state/ChannelPanel.java
@@ -227,7 +227,8 @@ public class ChannelPanel extends JPanel
 				switch( changedAttribute )
 				{
 					case CHANNEL_STATE:
-						if( mChannelState.getState() != null )
+						if( mChannelState != null &&
+							mChannelState.getState() != null )
 						{
 				    		mStateLabel.setText( mChannelState.getState().getDisplayValue() );
 						}