diff --git a/pom.xml b/pom.xml
index cf2c5ae..5455abe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>5.2.0RC18</version>
+	<version>5.2.0RC19</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -129,7 +129,7 @@
 		<dependency>
 		    <groupId>com.github.bwssytems</groupId>
 		    <artifactId>broadlink-java-api</artifactId>
-		    <version>52f6bcb628</version>
+		    <version>c105234547</version>
 		</dependency>
 		<dependency>
 		  <groupId>org.apache.commons</groupId>
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java b/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java
index 314a140..7de1ef0 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java
@@ -236,7 +236,11 @@ public class BroadlinkHome implements Home {
 			                	}
 			                		
 			                	DatagramPacket thePacket = theDevice.sendCmdPkt(Configuration.BROADLINK_DISCONVER_TIMEOUT, thePayload);
-			                	String returnData = DatatypeConverter.printHexBinary(thePacket.getData());
+			                	String returnData = null;
+			                	if(thePacket != null)
+			                		returnData = DatatypeConverter.printHexBinary(thePacket.getData());
+			                	else
+			                		returnData = "No Data - null";
 			                	log.debug("RM2 Device data return: <<<" + returnData + ">>>");
 							} catch (IOException e) {
 								log.error("Call to " + broadlinkCommand.getId() + " - " + _rm2 + " device failed with exception.", e);
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
index de9ffc1..d2c4255 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
@@ -198,7 +198,8 @@ public class LifxHome implements Home {
 			log.debug("Home is already closed....");
 			return;
 		}
-		client.close();
+		if(client != null)
+			client.close();
 		closed = true;
 	}
     private static class MyLightListener implements LFXLightCollectionListener {