Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision c21d4d64870698b91707f203def6398db79bff84)
+++ uspace/srv/loader/main.c	(revision e43acd38c0225c4fac18ac08d9da30ca442ef906)
@@ -300,9 +300,6 @@
 
 #ifdef CONFIG_RTLD
-	if (prog_info.env) {
-		pcb.tcb = rtld_tls_make(prog_info.env);
-	} else {
-		pcb.tcb = tls_make(prog_info.finfo.base);
-	}
+	assert(prog_info.env != NULL);
+	pcb.tcb = rtld_tls_make(prog_info.env);
 #else
 	pcb.tcb = tls_make(prog_info.finfo.base);