diff --git a/nsclient/trunk/scripts/check_eva/check_eva.exe b/nsclient/trunk/scripts/check_eva/check_eva.exe
index a66a1ba..23c4ea5 100644
Binary files a/nsclient/trunk/scripts/check_eva/check_eva.exe and b/nsclient/trunk/scripts/check_eva/check_eva.exe differ
diff --git a/nsclient/trunk/scripts/check_eva/check_eva.py b/nsclient/trunk/scripts/check_eva/check_eva.py
index 8379528..e6cea6c 100644
--- a/nsclient/trunk/scripts/check_eva/check_eva.py
+++ b/nsclient/trunk/scripts/check_eva/check_eva.py
@@ -441,7 +441,11 @@ def check_generic(command="ls disk full",namefield="objectname", perfdata_fields
 	summary = "%s objects found " % len(objects)
         for i in objects:
                 systemname = i['systemname']
-                objectname = i[namefield]
+		# Some versions of commandview use "objectname" instead of namefield
+		if i.has_key( namefield ):
+			objectname = i[namefield]
+		else:
+			objectname = i['objectname']
                 
 		# Lets see if this object is working
                 nagios_state = max( check_operationalstate(i), nagios_state )
diff --git a/nsclient/trunk/scripts/check_eva/library.zip b/nsclient/trunk/scripts/check_eva/library.zip
index 9a4b69d..9588362 100644
Binary files a/nsclient/trunk/scripts/check_eva/library.zip and b/nsclient/trunk/scripts/check_eva/library.zip differ