diff --git a/hardware/pdu/raritan/snmp/mode/components/resources.pm b/hardware/pdu/raritan/snmp/mode/components/resources.pm
index dbe93fb38..6f545d14d 100644
--- a/hardware/pdu/raritan/snmp/mode/components/resources.pm
+++ b/hardware/pdu/raritan/snmp/mode/components/resources.pm
@@ -99,6 +99,20 @@ $mapping = {
         State   => { oid => '.1.3.6.1.4.1.13742.6.5.4.3.1.3', map => \%map_state }, # measurementsOutletSensorState
         Value => { oid => '.1.3.6.1.4.1.13742.6.5.4.3.1.4' }, # measurementsOutletSensorValue
     },
+    ocprot_label => {
+        Label   => { oid => '.1.3.6.1.4.1.13742.6.3.4.3.1.2' }, # overCurrentProtectorLabel
+    },
+    ocprot => {
+        Unit    => { oid => '.1.3.6.1.4.1.13742.6.3.4.4.1.6', map => \%map_units }, # overCurrentProtectorSensorUnits
+        Decimal => { oid => '.1.3.6.1.4.1.13742.6.3.4.4.1.7' }, # overCurrentProtectorSensorDecimalDigits
+        EnabledThresholds => { oid => '.1.3.6.1.4.1.13742.6.3.4.4.1.25' }, # overCurrentProtectorSensorEnabledThresholds
+        LowerCriticalThreshold => { oid => '.1.3.6.1.4.1.13742.6.3.4.4.1.21' }, # overCurrentProtectorSensorLowerCriticalThreshold
+        LowerWarningThreshold => { oid => '.1.3.6.1.4.1.13742.6.3.4.4.1.22' }, # overCurrentProtectorSensorLowerWarningThreshold
+        UpperCriticalThreshold => { oid => '.1.3.6.1.4.1.13742.6.3.4.4.1.23' }, # overCurrentProtectorSensorUpperCriticalThreshold
+        UpperWarningThreshold => { oid => '.1.3.6.1.4.1.13742.6.3.4.4.1.24' }, # overCurrentProtectorSensorUpperWarningThreshold
+        State   => { oid => '.1.3.6.1.4.1.13742.6.5.3.3.1.3', map => \%map_state }, # measurementsOverCurrentProtectorSensorState
+        Value => { oid => '.1.3.6.1.4.1.13742.6.5.3.3.1.4' }, # measurementsOverCurrentProtectorSensorValue
+    },
 };
 
 %raritan_type = (
diff --git a/hardware/pdu/raritan/snmp/mode/components/sensor.pm b/hardware/pdu/raritan/snmp/mode/components/sensor.pm
index e145b295e..c05980d5f 100644
--- a/hardware/pdu/raritan/snmp/mode/components/sensor.pm
+++ b/hardware/pdu/raritan/snmp/mode/components/sensor.pm
@@ -52,7 +52,7 @@ sub check {
         my $instance_type = $raritan_type{$component};
         my $value_type = $map_type{$instance_type};
         foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}})) {
-            next if ($oid !~ /^$mapping->{$options{type}}->{Label}->{State}\.(\d+)\.(\d+)\.$instance_type$/);
+            next if ($oid !~ /^$mapping->{$options{type}}->{State}->{oid}\.(\d+)\.(\d+)\.$instance_type$/);
             my $instance = $1 . '.' . $2 . '.' . $instance_type;
             my $result = $self->{snmp}->map_instance(mapping => $mapping->{$options{type}}, results => $self->{results}, instance => $instance);
             my $result2 = $self->{snmp}->map_instance(mapping => $mapping->{$options{type} . '_label'}, results => $self->{results}, instance => $1 . '.' . $2);
@@ -68,7 +68,7 @@ sub check {
             
             $self->{components}->{$component}->{total}++;
 
-            my $value = defined($result->{SignedValue}) ? $result->{SignedValue} : '-';
+            my $value = (defined($result->{Value}) && $result->{Value} ne '') ? $result->{Value} : '-';
             if ($value =~ /[0-9]/) {
                 $value *= 10 ** -int($result->{Decimal});
             }
@@ -83,15 +83,16 @@ sub check {
                                                 $instance, $component, $result->{State}));
             }
             
-            if ($value->{value} =~ /[0-9]/) {
+            if ($value =~ /[0-9]/) {
                 my ($exit2, $warn, $crit, $checked) = $self->get_severity_numeric(section => $component, instance => $instance, value => $value);
                 if ($checked == 0) {
+                    $result->{EnabledThresholds} = oct("0b". unpack('b*', $result->{EnabledThresholds}));
                     my $warn_th = '~:';
-                    $warn_th = $result->{LowerWarningThreshold} if (($result->{EnabledThresholds} & (1 << 1)));
-                    $warn_th .= $result->{UpperWarningThreshold} if (($result->{EnabledThresholds} & (1 << 2)));
+                    $warn_th = $result->{LowerWarningThreshold} * 10 ** -int($result->{Decimal}) if (($result->{EnabledThresholds} & (1 << 1)));
+                    $warn_th .= $result->{UpperWarningThreshold} * 10 ** -int($result->{Decimal}) if (($result->{EnabledThresholds} & (1 << 2)));
                     my $crit_th = '~:';
-                    $crit_th = $result->{LowerCriticalThreshold} if (($result->{EnabledThresholds} & (1 << 0)));
-                    $crit_th .= $result->{UpperCriticalThreshold} if (($result->{EnabledThresholds} & (1 << 3)));
+                    $crit_th = $result->{LowerCriticalThreshold} * 10 ** -int($result->{Decimal}) if (($result->{EnabledThresholds} & (1 << 0)));
+                    $crit_th .= $result->{UpperCriticalThreshold} * 10 ** -int($result->{Decimal}) if (($result->{EnabledThresholds} & (1 << 3)));
                     $self->{perfdata}->threshold_validate(label => 'warning-' . $component . '-instance-' . $instance, value => $warn_th);
                     $self->{perfdata}->threshold_validate(label => 'critical-' . $component . '-instance-' . $instance, value => $crit_th);
                     $warn = $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $component . '-instance-' . $instance);
diff --git a/hardware/pdu/raritan/snmp/mode/inletsensors.pm b/hardware/pdu/raritan/snmp/mode/inletsensors.pm
index 3117028ee..478e14561 100644
--- a/hardware/pdu/raritan/snmp/mode/inletsensors.pm
+++ b/hardware/pdu/raritan/snmp/mode/inletsensors.pm
@@ -63,10 +63,6 @@ sub check_options {
     $self->{filter} = [];
     foreach my $val (@{$self->{option_results}->{filter}}) {
         my @values = split (/,/, $val);
-        if (scalar(@values) < 2) {
-            $self->{output}->add_option_msg(short_msg => "Wrong filter option '" . $val . "'.");
-            $self->{output}->option_exit();
-        }
         push @{$self->{filter}}, { filter => $values[0], instance => $values[1] }; 
     }
     
diff --git a/hardware/pdu/raritan/snmp/mode/ocprotsensors.pm b/hardware/pdu/raritan/snmp/mode/ocprotsensors.pm
new file mode 100644
index 000000000..54d19662b
--- /dev/null
+++ b/hardware/pdu/raritan/snmp/mode/ocprotsensors.pm
@@ -0,0 +1,265 @@
+#
+# Copyright 2015 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package hardware::pdu::raritan::snmp::mode::ocprotsensors;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use hardware::pdu::raritan::snmp::mode::components::resources qw($thresholds %raritan_type);
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                { 
+                                  "filter:s@"               => { name => 'filter' },
+                                  "component:s"             => { name => 'component', default => '.*' },
+                                  "no-component:s"          => { name => 'no_component' },
+                                  "threshold-overload:s@"   => { name => 'threshold_overload' },
+                                  "warning:s@"              => { name => 'warning' },
+                                  "critical:s@"             => { name => 'critical' },
+                                });
+
+    $self->{components} = {};
+    $self->{no_components} = undef;
+    
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+    
+    if (defined($self->{option_results}->{no_component})) {
+        if ($self->{option_results}->{no_component} ne '') {
+            $self->{no_components} = $self->{option_results}->{no_component};
+        } else {
+            $self->{no_components} = 'critical';
+        }
+    }
+    
+    $self->{filter} = [];
+    foreach my $val (@{$self->{option_results}->{filter}}) {
+        my @values = split (/,/, $val);
+        push @{$self->{filter}}, { filter => $values[0], instance => $values[1] }; 
+    }
+    
+    $self->{overload_th} = {};
+    foreach my $val (@{$self->{option_results}->{threshold_overload}}) {
+        my @values = split (/,/, $val);
+        if (scalar(@values) < 3) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        my ($section, $instance, $status, $filter);
+        if (scalar(@values) == 3) {
+            ($section, $status, $filter) = @_;
+            $instance = '.*';
+        } else {
+             ($section, $instance, $status, $filter) = @_;
+        }
+        if ($self->{output}->is_litteral_status(status => $status) == 0) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload status '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        $self->{overload_th}->{$section} = [] if (!defined($self->{overload_th}->{$section}));
+        push @{$self->{overload_th}->{$section}}, {filter => $filter, status => $status, instance => $instance };
+    }
+    
+    $self->{numeric_threshold} = {};
+    foreach my $option (('warning', 'critical')) {
+        foreach my $val (@{$self->{option_results}->{$option}}) {
+            if ($val !~ /^(.*?),(.*?),(.*)$/) {
+                $self->{output}->add_option_msg(short_msg => "Wrong $option option '" . $val . "'.");
+                $self->{output}->option_exit();
+            }
+            my ($section, $instance, $value) = ($1, $2, $3);
+            if (!defined($raritan_type{$section})) {
+                $self->{output}->add_option_msg(short_msg => "Wrong $option option '" . $val . "'.");
+                $self->{output}->option_exit();
+            }
+            my $position = 0;
+            if (defined($self->{numeric_threshold}->{$section})) {
+                $position = scalar(@{$self->{numeric_threshold}->{$section}});
+            }
+            if (($self->{perfdata}->threshold_validate(label => $option . '-' . $section . '-' . $position, value => $value)) == 0) {
+                $self->{output}->add_option_msg(short_msg => "Wrong $option threshold '" . $value . "'.");
+                $self->{output}->option_exit();
+            }
+            $self->{numeric_threshold}->{$section} = [] if (!defined($self->{numeric_threshold}->{$section}));
+            push @{$self->{numeric_threshold}->{$section}}, { label => $option . '-' . $section . '-' . $position, threshold => $option, instance => $instance };
+        }
+    }
+}
+
+sub run {
+    my ($self, %options) = @_;
+    $self->{snmp} = $options{snmp};
+
+    my $snmp_request = [];
+    
+    my $mod_name = "hardware::pdu::raritan::snmp::mode::components::sensor";
+    centreon::plugins::misc::mymodule_load(output => $self->{output}, module => $mod_name,
+                                          error_msg => "Cannot load module '$mod_name'.");
+    my $func = $mod_name->can('load');
+    $func->(type => 'ocprot', request => $snmp_request); 
+    
+    $self->{results} = $self->{snmp}->get_multiple_table(oids => $snmp_request, return_type => 1);
+    
+    $func = $mod_name->can('check');
+    $func->($self, component => $self->{option_results}->{component}, type => 'ocprot'); 
+
+    my $total_components = 0;
+    my $display_by_component = '';
+    my $display_by_component_append = '';
+    foreach my $comp (sort(keys %{$self->{components}})) {
+        # Skipping short msg when no components
+        next if ($self->{components}->{$comp}->{total} == 0 && $self->{components}->{$comp}->{skip} == 0);
+        $total_components += $self->{components}->{$comp}->{total} + $self->{components}->{$comp}->{skip};
+        my $count_by_components = $self->{components}->{$comp}->{total} + $self->{components}->{$comp}->{skip}; 
+        $display_by_component .= $display_by_component_append . $self->{components}->{$comp}->{total} . '/' . $count_by_components . ' ' . $self->{components}->{$comp}->{name};
+        $display_by_component_append = ', ';
+    }
+    
+    $self->{output}->output_add(severity => 'OK',
+                                short_msg => sprintf("All %s sensors are ok [%s].", 
+                                                     $total_components,
+                                                     $display_by_component)
+                                );
+
+    if (defined($self->{option_results}->{no_component}) && $total_components == 0) {
+        $self->{output}->output_add(severity => $self->{no_components},
+                                    short_msg => 'No sensors are checked.');
+    }
+
+    $self->{output}->display();
+    $self->{output}->exit();
+}
+
+sub check_filter {
+    my ($self, %options) = @_;
+
+    foreach (@{$self->{filter}}) {
+        if ($options{section} =~ /$_->{filter}/) {
+            if (!defined($options{instance}) && !defined($_->{instance})) {
+                $self->{output}->output_add(long_msg => sprintf("Skipping $options{section} section."));
+                return 1;
+            } elsif (defined($options{instance}) && $options{instance} =~ /$_->{instance}/) {
+                $self->{output}->output_add(long_msg => sprintf("Skipping $options{section} section $options{instance} instance."));
+                return 1;
+            }
+        }
+    }
+    
+    return 0;
+}
+
+sub get_severity_numeric {
+    my ($self, %options) = @_;
+    my $status = 'OK'; # default
+    my $thresholds = { warning => undef, critical => undef };
+    my $checked = 0;
+    
+    if (defined($self->{numeric_threshold}->{$options{section}})) {
+        my $exits = [];
+        foreach (@{$self->{numeric_threshold}->{$options{section}}}) {
+            if ($options{instance} =~ /$_->{instance}/) {
+                push @{$exits}, $self->{perfdata}->threshold_check(value => $options{value}, threshold => [ { label => $_->{label}, exit_litteral => $_->{threshold} } ]);
+                $thresholds->{$_->{threshold}} = $self->{perfdata}->get_perfdata_for_output(label => $_->{label});
+                $checked = 1;
+            }
+        }
+        $status = $self->{output}->get_most_critical(status => $exits) if (scalar(@{$exits}) > 0);
+    }
+    
+    return ($status, $thresholds->{warning}, $thresholds->{critical}, $checked);
+}
+
+sub get_severity {
+    my ($self, %options) = @_;
+    my $status = 'UNKNOWN'; # default 
+    
+    if (defined($self->{overload_th}->{$options{section}})) {
+        foreach (@{$self->{overload_th}->{$options{section}}}) {            
+            if ($options{value} =~ /$_->{filter}/i) {
+                $status = $_->{status};
+                return $status;
+            }
+        }
+    }
+    my $label = defined($options{label}) ? $options{label} : $options{section};
+    foreach (@{$thresholds->{$label}}) {
+        if ($options{value} =~ /$$_[0]/i) {
+            $status = $$_[1];
+            return $status;
+        }
+    }
+    
+    return $status;
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check overcurrent protectors sensors.
+
+=over 8
+
+=item B<--component>
+
+Which component to check (Default: '.*').
+
+=item B<--filter>
+
+Exclude some parts (comma seperated list) (Example: --filter=airPressure --filter=rmsVoltage)
+Can also exclude specific instance: --filter=rmsVoltage,C1
+
+=item B<--no-component>
+
+Return an error if no compenents are checked.
+If total (with skipped) is 0. (Default: 'critical' returns).
+
+=item B<--threshold-overload>
+
+Set to overload default threshold values (syntax: section,[instance,]status,regexp)
+It used before default thresholds (order stays).
+Example: --threshold-overload='powerQuality,CRITICAL,^(?!(normal)$)'
+
+=item B<--warning>
+
+Set warning threshold for temperatures (syntax: type,instance,threshold)
+Example: --warning='powerQuality,.*,30'
+
+=item B<--critical>
+
+Set critical threshold for temperatures (syntax: type,instance,threshold)
+Example: --critical='powerQuality,.*,40'
+
+=back
+
+=cut
\ No newline at end of file
diff --git a/hardware/pdu/raritan/snmp/mode/outletsensors.pm b/hardware/pdu/raritan/snmp/mode/outletsensors.pm
index a03d5454b..cf369ac9e 100644
--- a/hardware/pdu/raritan/snmp/mode/outletsensors.pm
+++ b/hardware/pdu/raritan/snmp/mode/outletsensors.pm
@@ -63,10 +63,6 @@ sub check_options {
     $self->{filter} = [];
     foreach my $val (@{$self->{option_results}->{filter}}) {
         my @values = split (/,/, $val);
-        if (scalar(@values) < 2) {
-            $self->{output}->add_option_msg(short_msg => "Wrong filter option '" . $val . "'.");
-            $self->{output}->option_exit();
-        }
         push @{$self->{filter}}, { filter => $values[0], instance => $values[1] }; 
     }
     
diff --git a/hardware/pdu/raritan/snmp/plugin.pm b/hardware/pdu/raritan/snmp/plugin.pm
index c04ea96a5..cf9db830a 100644
--- a/hardware/pdu/raritan/snmp/plugin.pm
+++ b/hardware/pdu/raritan/snmp/plugin.pm
@@ -34,6 +34,7 @@ sub new {
     %{$self->{modes}} = (
                          'inlet-sensors'    => 'hardware::pdu::raritan::snmp::mode::inletsensors',
                          'outlet-sensors'   => 'hardware::pdu::raritan::snmp::mode::outletsensors',
+                         'ocprot-sensors'   => 'hardware::pdu::raritan::snmp::mode::ocprotsensors',
                          );
 
     return $self;