diff --git a/setup.sh b/setup.sh
index 1675819..bd46738 100644
--- a/setup.sh
+++ b/setup.sh
@@ -647,7 +647,7 @@ echo "Done."
 
 echo "#! /bin/bash" > /mnt/zfshealth.sh
 echo "problems=0; emailSubject=\"\`hostname\` - ZFS pool - HEALTH check\"; emailMessage=\"\"" >> /mnt/zfshealth.sh
-echo "condition=\$(/sbin/zpool status | egrep -i '(DEGRADED|FAULTED|OFFLINE|UNAVAIL|REMOVED|FAIL|DESTROYED|corrupt|cannot|unrecover)')" >> /mnt/zfshealth.sh
+echo "condition=\$(/sbin/zpool status | grep -e \"^ *state:\" | egrep -i '(DEGRADED|FAULTED|OFFLINE|UNAVAIL|REMOVED|FAIL|DESTROYED|corrupt|cannot|unrecover)')" >> /mnt/zfshealth.sh
 echo "if [ \"\${condition}\" ]; then emailSubject=\"\$emailSubject - fault\"; problems=1; fi" >> /mnt/zfshealth.sh
 echo "maxCapacity=80" >> /mnt/zfshealth.sh
 echo "if [ \${problems} -eq 0 ]; then" >> /mnt/zfshealth.sh
@@ -658,7 +658,7 @@ echo "    if [ \$line -ge \$maxCapacity ]; then emailSubject=\"\$emailSubject -
 echo "  done" >> /mnt/zfshealth.sh
 echo "fi" >> /mnt/zfshealth.sh
 echo "if [ \${problems} -eq 0 ]; then" >> /mnt/zfshealth.sh
-echo "  errors=\$(/sbin/zpool status | grep ONLINE | grep -v state | awk '{print $3 $4 $5}' | grep -v 000)" >> /mnt/zfshealth.sh
+echo "  errors=\$(/sbin/zpool status | grep ONLINE | grep -v state | awk '{print \$3 \$4 \$5}' | grep -v 000)" >> /mnt/zfshealth.sh
 echo "  if [ \"\${errors}\" ]; then emailSubject=\"\$emailSubject - Drive Errors\"; problems=1; fi" >> /mnt/zfshealth.sh
 echo "fi" >> /mnt/zfshealth.sh
 echo "scrubExpire=691200" >> /mnt/zfshealth.sh