--- libaitrpc/src/lists.c	2010/07/07 15:18:22	1.1.2.6
+++ libaitrpc/src/lists.c	2010/07/08 07:16:36	1.1.2.7
@@ -50,8 +50,8 @@ rpc_srv_declValsCall(rpc_func_t * __restrict call, int
 	if (!call || return_vals < 0) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t declare return variables for RPC call...\n");
 		return -1;
-	} /* else
-		call->func_args = return_vals; */
+	} else
+		call->func_args = return_vals;
 
 	if (!return_vals) {
 		if (call->func_vals) {
@@ -170,7 +170,7 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, const
 
 	func->func_parent = srv;
 
-	if (rpc_srv_declValsCall(func, args) == -1) {
+	if (args > 0 && rpc_srv_declValsCall(func, args) == -1) {
 		free(func);
 		return -1;
 	}