diff --git a/src/ld_so/linker.rs b/src/ld_so/linker.rs
index 210f8cdbba..53ce3e5e4e 100644
--- a/src/ld_so/linker.rs
+++ b/src/ld_so/linker.rs
@@ -166,10 +166,9 @@ impl Linker {
         )?;
 
         unsafe {
-            let tcb = if self.objects.len() == 0 {
-                Tcb::new(self.tls_size)?
-            } else {
-                Tcb::current().unwrap()
+            let tcb = match Tcb::current() {
+                Some(some) => some,
+                None => Tcb::new(self.tls_size)?,
             };
             tcb.append_masters(tcb_masters);
             tcb.copy_masters()?;