diff --git a/salt/common/tools/sbin/so-raid-status b/salt/common/tools/sbin/so-raid-status
index c1b0d962b..e817554d3 100755
--- a/salt/common/tools/sbin/so-raid-status
+++ b/salt/common/tools/sbin/so-raid-status
@@ -35,7 +35,7 @@ appliance_check() {
 }
 
 check_nsm_raid() {
-  PERCCLI=$(/opt/raidtools/perccli/perccli64 /c0/v0 show|grep Raid|grep Optl)
+  PERCCLI=$(/opt/raidtools/perccli/perccli64 /c0/v0 show|grep RAID|grep Optl)
   MEGACTL=$(/opt/raidtools/megasasctl |grep optimal)
 
   if [[ $APPLIANCE == '1' ]]; then
@@ -52,7 +52,7 @@ check_nsm_raid() {
 }
 
 check_boss_raid() {
-  MVCLI=$(/opt/raidtools/megasasctl |grep optimal)
+  MVCLI=$(/usr/local/bin/mvcli info -o vd |grep status |grep functional)
 
   if [[ -n $DUDEYOUGOTADELL ]]; then
     if [[ -n $MVCLI ]]; then
@@ -83,9 +83,11 @@ check_software_raid() {
 appliance_check
 check_nsm_raid
 check_boss_raid
+{%- if salt['grains.get']('sosmodel', '') %}
 {%- if grains['sosmodel'] in ['SOSMN', 'SOSSNNV'] %}
 check_software_raid
 {%- endif %}
+{%- endif %}
 
 if [[ -n $SWRAID ]]; then
   if [[ $SWRAID == '0' && BOSSRAID == '0' ]]; then