diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 84d1915b92c157364a3790976cfa9f49f634f58f..6ef9d986569cced2ae39e0d14880674d6ab2b657 100644
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -2,6 +2,7 @@
  * bhyve_driver.c: core driver methods for managing bhyve guests
  *
  * Copyright (C) 2014 Roman Bogorodskiy
+ * Copyright (C) 2014 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -123,16 +124,10 @@ bhyveAutostartDomains(bhyveConnPtr driver)
  * Returns: a reference to a virCapsPtr instance or NULL
  */
 static virCapsPtr
-bhyveDriverGetCapabilities(bhyveConnPtr driver)
+bhyveDriverGetCapabilities(bhyveConnPtr driver ATTRIBUTE_NONNULL)
 {
-    virCapsPtr ret = NULL;
 
-    if (driver == NULL)
-        return NULL;
-
-    ret = virObjectRef(driver->caps);
-
-    return ret;
+    return virObjectRef(driver->caps);
 }
 
 static char *