1 files changed, 3 insertions, 3 deletions
diff --git a/dev/boot/src/BootThread.cc b/dev/boot/src/BootThread.cc
index 5566e3e0..c477d659 100644
--- a/dev/boot/src/BootThread.cc
+++ b/dev/boot/src/BootThread.cc
@@ -156,16 +156,16 @@ BootThread::BootThread(VoidPtr blob) : fStartAddress(nullptr), fBlob(blob) {
 
 /// @note handover header has to be valid!
 Int32 BootThread::Start(HEL::BootInfoHeader* handover, Bool own_stack) {
-  fHandover = handover;
-
   if (!fStartAddress) {
     return kEfiFail;
   }
 
-  if (!fHandover) {
+  if (!handover) {
     return kEfiFail;
   }
 
+  fHandover = handover;
+
   BootTextWriter writer;
 
   writer.Write("BootZ: Starting: ").Write(fBlobName).Write("\r");