diff --git a/src/storage/hp/alletra/restapi/mode/diskstatus.pm b/src/storage/hp/alletra/restapi/mode/diskstatus.pm
index 2f7124b50..f0fd857fd 100644
--- a/src/storage/hp/alletra/restapi/mode/diskstatus.pm
+++ b/src/storage/hp/alletra/restapi/mode/diskstatus.pm
@@ -216,7 +216,12 @@ sub manage_selection {
             manufacturer => $disk->{manufacturer},
             model        => $disk->{model},
             serial       => $disk->{serialNumber}
-        };
+        }
+    }
+
+    if (scalar(keys %{$self->{disks}}) <= 0) {
+         $self->{output}->add_option_msg(short_msg => "No disk found.");
+         $self->{output}->option_exit();
     }
 }
 
@@ -329,14 +334,6 @@ Threshold.
 
 Threshold.
 
-=item B<--warning-status>
-
-Threshold.
-
-=item B<--critical-status>
-
-Threshold.
-
 =back
 
 =cut
diff --git a/src/storage/hp/alletra/restapi/mode/volumestatus.pm b/src/storage/hp/alletra/restapi/mode/volumestatus.pm
index 04e9ca801..062b4e419 100644
--- a/src/storage/hp/alletra/restapi/mode/volumestatus.pm
+++ b/src/storage/hp/alletra/restapi/mode/volumestatus.pm
@@ -214,7 +214,12 @@ sub manage_selection {
             provisioning_type => defined($provisioning_type{$volume->{provisioningType}}) ?
                 $provisioning_type{$volume->{provisioningType}} : 'NOT_DOCUMENTED',
             readonly          => $volume->{readOnly}
-        };
+        }
+    }
+
+    if (scalar(keys %{$self->{volumes}}) <= 0) {
+        $self->{output}->add_option_msg(short_msg => "No volume found.");
+        $self->{output}->option_exit();
     }
 }