diff --git a/check_nfs_server b/check_nfs_server
index 1975bf1a95a23660c37dcc81a8dbdafef3546a62..90a6ea9c1d1c9fb435007c1f1fabc5d08cb75829 100755
--- a/check_nfs_server
+++ b/check_nfs_server
@@ -18,8 +18,8 @@ import os
 import sys
 import re
 
-bad_re = re.compile("(NFS|nfs:) server (?P<bad>[^ ]*) not responding")
-good_re = re.compile("NFS server ([^ ]*) OK")
+bad_re = re.compile("(NFS|nfs:) server (?P<server>[^ ]*) not responding")
+good_re = re.compile("NFS server (?P<server>[^ ]*) (ok|OK)")
 time_re = re.compile("((?P<year>[1-9][0-9]{3})-"
                      "(?P<mon>[0-9]{2})-"
                      "(?P<day>[0-9]{2}) "
@@ -66,12 +66,12 @@ def checkfile(fn, now):
 
         bad = bad_re.search(line)
         if bad is not None:
-            res[bad.group("bad")] = res.get(bad.group(1), 0) + 1
+            res[bad.group("server")] = res.get(bad.group(1), 0) + 1
             continue
 
         good = good_re.search(line)
-        if good is not None:
-            del res[bad.group(1)]
+        if good is not None and good.group("server") in res:
+            del res[good.group("server")]
 
     return res