diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java
index 98b0b4e7d..f58d0343d 100644
--- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java
+++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java
@@ -54,4 +54,6 @@ public interface Constants {
     String CANCEL_ESC = "Cancel (Esc)";
 
     String NAME_ASC = "name:asc";
+
+    String NOT_AVAILABLE_NULL = "n/a (null)";
 }
\ No newline at end of file
diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java
index 1a18b5453..fd4843ddd 100644
--- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java
+++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java
@@ -225,11 +225,9 @@ public class RolloutView extends TableView<MgmtRolloutResponseBody, Long> {
             targetFilter.setValue(rollout.getTargetFilterQuery());
             final MgmtDistributionSet distributionSetMgmt = hawkbitClient.getDistributionSetRestApi()
                     .getDistributionSet(rollout.getDistributionSetId()).getBody();
-            if (distributionSetMgmt == null) { // should not be here
-                distributionSet.setValue("n/a (null)");
-            } else {
-                distributionSet.setValue(distributionSetMgmt.getName() + ":" + distributionSetMgmt.getVersion());
-            }
+            distributionSet.setValue(distributionSetMgmt == null
+                    ? NOT_AVAILABLE_NULL // should not be the case
+                    : distributionSetMgmt.getName() + ":" + distributionSetMgmt.getVersion());
             actonType.setValue(switch (rollout.getType()) {
                 case SOFT -> Constants.SOFT;
                 case FORCED -> Constants.FORCED;
diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java
index d2957c35e..1b576dfc4 100644
--- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java
+++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java
@@ -379,8 +379,8 @@ public class TargetView extends TableView<MgmtTarget, String> {
             lastModifiedAt.setValue(new Date(target.getLastModifiedAt()).toString());
             securityToken.setValue(target.getSecurityToken());
 
-            MgmtPollStatus pollStatus = target.getPollStatus();
-            lastPoll.setValue(new Date(pollStatus.getLastRequestAt()).toString());
+            final MgmtPollStatus pollStatus = target.getPollStatus();
+            lastPoll.setValue(pollStatus == null ? NOT_AVAILABLE_NULL : new Date(pollStatus.getLastRequestAt()).toString());
             final ResponseEntity<MgmtTargetAttributes> response = hawkbitClient.getTargetRestApi().getAttributes(target.getControllerId());
             if (response.getStatusCode().is2xxSuccessful()) {
                 targetAttributes.setValue(Objects.requireNonNullElse(response.getBody(), Collections.emptyMap()).entrySet().stream()