Index: uspace/lib/c/generic/taskman.c
===================================================================
--- uspace/lib/c/generic/taskman.c	(revision 03daabd16d88c5efb885074dee56d30ea08f1b56)
+++ uspace/lib/c/generic/taskman.c	(revision 5be636105b3cdb8ad0eb0aaa7fa4fdda0d6c9413)
@@ -60,4 +60,6 @@
 
 	async_exch_t *exch = async_exchange_begin(session_taskman);
+	assert(exch);
+
 	return exch;
 }
@@ -97,12 +99,9 @@
 async_sess_t *taskman_session_ns(void)
 {
-	assert(session_taskman);
-
-	async_exch_t *exch = async_exchange_begin(session_taskman);
-	assert(exch);
+	async_exch_t *exch = taskman_exchange_begin();
 
 	async_sess_t *sess = async_connect_me_to(exch, INTERFACE_NS,
 	    TASKMAN_CONNECT_TO_NS, 0);
-	async_exchange_end(exch);
+	taskman_exchange_end(exch);
 
 	return sess;
@@ -112,10 +111,8 @@
 async_sess_t *taskman_session_loader(void)
 {
-	assert(session_taskman);
-
-	async_exch_t *exch = async_exchange_begin(session_taskman);
+	async_exch_t *exch = taskman_exchange_begin();
 	async_sess_t *sess = async_connect_me_to(exch, INTERFACE_LOADER,
 	    TASKMAN_CONNECT_TO_LOADER, 0);
-	async_exchange_end(exch);
+	taskman_exchange_end(exch);
 
 	return sess;
@@ -137,9 +134,7 @@
 errno_t taskman_intro_loader(void)
 {
-	assert(session_taskman);
-
-	async_exch_t *exch = async_exchange_begin(session_taskman);
+	async_exch_t *exch = taskman_exchange_begin();
 	errno_t rc = async_connect_to_me(exch, INTERFACE_LOADER, TASKMAN_LOADER_CALLBACK, 0);
-	async_exchange_end(exch);
+	taskman_exchange_end(exch);
 
 	return rc;
@@ -152,7 +147,5 @@
 errno_t taskman_intro_ns(void)
 {
-	assert(session_taskman);
-
-	async_exch_t *exch = async_exchange_begin(session_taskman);
+	async_exch_t *exch = taskman_exchange_begin();
 	aid_t req = async_send_0(exch, TASKMAN_I_AM_NS, NULL);