diff --git a/bundles/icinga2/files/check_usv_snmp b/bundles/icinga2/files/check_usv_snmp
index adc4966..cdfac36 100644
--- a/bundles/icinga2/files/check_usv_snmp
+++ b/bundles/icinga2/files/check_usv_snmp
@@ -28,41 +28,42 @@ try:
 
     # Estimated runtime in minutes
     if int(result['1.2.3.0']) < 15:
-        crit.add('Remaining runtime is less than 15 minutes! Only {} minutes left.'.format(result['1.2.3.0']))
+        crit.add('Remaining runtime is less than 15 minutes!')
     elif int(result['1.2.3.0']) < 25:
-        warn.add('Remaining runtime is less than 25 minutes! Only {} minutes left.'.format(result['1.2.3.0']))
+        warn.add('Remaining runtime is less than 25 minutes!')
 
     # Battery status in percent
     if int(result['1.2.4.0']) < 10:
-        crit.add('Remaining runtime is less than 10%! Only {}% left.'.format(result['1.2.4.0']))
+        crit.add('Remaining runtime is less than 10%!')
     elif int(result['1.2.4.0']) < 25:
-        warn.add('Remaining runtime is less than 25%! Only {}% left.'.format(result['1.2.4.0']))
+        warn.add('Remaining runtime is less than 25%!')
 
     # Output load in percent
     if int(result['1.4.4.1.5.1']) > 90:
-        crit.add('Output Power is more than 90% of rated capacity: {} W'.format(result['1.4.4.1.4.1']))
+        crit.add('Output Power is more than 90% of rated capacity!')
     elif int(result['1.4.4.1.5.1']) > 80:
-        warn.add('Output Power is more than 80% of rated capacity: {} W'.format(result['1.4.4.1.4.1']))
+        warn.add('Output Power is more than 80% of rated capacity!')
+
+    print('{model} running{from_bat} at {out_pct}% load ({out_w} W), battery at {bat_pct}% ({bat_min} min)'.format(
+        model=result['1.1.2.0'],
+        out_pct=result['1.4.4.1.5.1'],
+        out_w=result['1.4.4.1.4.1'],
+        bat_pct=result['1.2.4.0'],
+        bat_min=result['1.2.3.0'],
+        from_bat=' from battery' if int(result['1.2.2.0']) else '',
+    ))
 
     for line in sorted(crit):
-        print(line)
+        print('CRIT: ' + line)
 
     for line in sorted(warn):
-        print(line)
+        print('WARN: ' + line)
 
     if crit:
         exit(2)
     elif warn:
         exit(1)
     else:
-        print('{model} running{from_bat} at {out_pct}% load ({out_w} W), battery at {bat_pct}% ({bat_min} min)'.format(
-            model=result['1.1.2.0'],
-            out_pct=result['1.4.4.1.5.1'],
-            out_w=result['1.4.4.1.4.1'],
-            bat_pct=result['1.2.4.0'],
-            bat_min=result['1.2.3.0'],
-            from_bat=' from battery' if int(result['1.2.2.0']) else '',
-        ))
         exit(0)
 except Exception as e:
     print(repr(e))