From 07524355cdf4ff673732570d5d59cca466c5d398 Mon Sep 17 00:00:00 2001
From: Leo Siepel <leosiepel@gmail.com>
Date: Mon, 21 Dec 2020 22:54:06 +0100
Subject: [PATCH] Some feedback resolved

---
 .../internal/api/exception/PlugwiseHABadRequestException.java | 4 +++-
 .../internal/api/exception/PlugwiseHAException.java           | 4 +++-
 .../api/exception/PlugwiseHANotAuthorizedException.java       | 4 +++-
 .../internal/api/model/PlugwiseHAControllerRequest.java       | 3 +++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHABadRequestException.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHABadRequestException.java
index 0afad811f0e18..d7a2dab57f9e1 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHABadRequestException.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHABadRequestException.java
@@ -12,12 +12,14 @@
  */
 package org.openhab.binding.plugwiseha.internal.api.exception;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link PlugwiseHABadRequestException} represents a binding specific {@link Exception}.
  *
  * @author Bas van Wetten - Initial contribution
  */
-
+@NonNullByDefault
 public class PlugwiseHABadRequestException extends PlugwiseHAException {
 
     private static final long serialVersionUID = 1L;
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHAException.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHAException.java
index a6c7a958239fa..19a768d1a3b47 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHAException.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHAException.java
@@ -12,12 +12,14 @@
  */
 package org.openhab.binding.plugwiseha.internal.api.exception;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link PlugwiseHAException} represents a binding specific {@link Exception}.
  *
  * @author Bas van Wetten - Initial contribution
  */
-
+@NonNullByDefault
 public class PlugwiseHAException extends Exception {
 
     private static final long serialVersionUID = 1L;
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHANotAuthorizedException.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHANotAuthorizedException.java
index c6a090ba91c88..a756a7833d344 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHANotAuthorizedException.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/exception/PlugwiseHANotAuthorizedException.java
@@ -12,12 +12,14 @@
  */
 package org.openhab.binding.plugwiseha.internal.api.exception;
 
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
 /**
  * The {@link PlugwiseHANotAuthorizedException} signals the controller denied a request due to invalid credentials.
  *
  * @author Bas van Wetten - Initial contribution
  */
-
+@NonNullByDefault
 public class PlugwiseHANotAuthorizedException extends PlugwiseHAException {
 
     private static final long serialVersionUID = 1L;
diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java
index 2087770c2f2b0..6c06347bc2df9 100644
--- a/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java
+++ b/bundles/org.openhab.binding.plugwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/PlugwiseHAControllerRequest.java
@@ -239,6 +239,9 @@ private ContentResponse getContentResponse() throws PlugwiseHAException {
             } else if (cause instanceof ConnectException) {
                 // Cannot connect
                 throw new PlugwiseHAException(cause);
+            } else if (cause == null) {
+                // Unable to unwrap
+                throw new PlugwiseHAException(e);
             } else {
                 // Catch all
                 throw new PlugwiseHAException(cause);