diff --git a/src/wrapper/wrap_cl.hpp b/src/wrapper/wrap_cl.hpp
index 7ae60dd51727c167ef4e59af5013abdc5ed01b72..2a462764a809a60699b967815f6b051feedcb7f8 100644
--- a/src/wrapper/wrap_cl.hpp
+++ b/src/wrapper/wrap_cl.hpp
@@ -527,9 +527,20 @@ namespace pyopencl
           case CL_DEVICE_OPENCL_C_VERSION:
             PYOPENCL_GET_STR_INFO(Device, m_device, param_name);
 #endif
+#ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV
+          case CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV:
+          case CL_DEVICE_COMPUTE_CAPABILITY_MINOR_NV:
+          case CL_DEVICE_REGISTERS_PER_BLOCK_NV:
+          case CL_DEVICE_WARP_SIZE_NV:
+            DEV_GET_INT_INF(cl_uint);
+          case CL_DEVICE_GPU_OVERLAP_NV:
+          case CL_DEVICE_KERNEL_EXEC_TIMEOUT_NV:
+          case CL_DEVICE_INTEGRATED_MEMORY_NV:
+            DEV_GET_INT_INF(cl_bool);
+#endif
 
           default:
-            throw error("Platform.get_info", CL_INVALID_VALUE);
+            throw error("Device.get_info", CL_INVALID_VALUE);
         }
       }
   };