From ece555dead9e86875a1234c442c5f276be95994b Mon Sep 17 00:00:00 2001
From: denny <dennissheirer2002@yahoo.com>
Date: Sat, 27 Feb 2016 09:04:13 -0500
Subject: [PATCH] Merges master 1550c62 - channel state panel null checking

---
 src/module/decode/state/ChannelPanel.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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() );
 						}