diff --git a/src/plugins/hllapi/calls.cc b/src/plugins/hllapi/calls.cc
index 86f1a46..2f5909f 100644
--- a/src/plugins/hllapi/calls.cc
+++ b/src/plugins/hllapi/calls.cc
@@ -59,7 +59,7 @@
 		return HLLAPI_STATUS_SYSTEM_ERROR;
 	}
 
- 	return hSession ? HLLAPI_STATUS_SUCCESS : HLLAPI_STATUS_SYSTEM_ERROR;
+ 	return hSession ? HLLAPI_STATUS_SUCCESS : HLLAPI_STATUS_UNAVAILABLE;
  }
 
  HLLAPI_API_CALL hllapi_deinit(void)
diff --git a/src/plugins/hllapi/hllapi.c b/src/plugins/hllapi/hllapi.c
index 9b9b1e8..dfbff28 100644
--- a/src/plugins/hllapi/hllapi.c
+++ b/src/plugins/hllapi/hllapi.c
@@ -135,10 +135,7 @@ static int connect_ps(char *buffer, unsigned short *length, unsigned short *rc)
 		buffer = tempbuffer;
 	}
 
-	if(hllapi_init(buffer) == 0)
-		*rc = HLLAPI_STATUS_SUCCESS;
-	else
-		*rc = HLLAPI_STATUS_UNAVAILABLE;
+	*rc = hllapi_init(buffer);
 
 	if(tempbuffer)
 		free(tempbuffer);
--
libgit2 0.21.2