diff --git a/rEFIt_UEFI/Platform/Hibernate.cpp b/rEFIt_UEFI/Platform/Hibernate.cpp
index a4c63bd22..06d212e02 100644
--- a/rEFIt_UEFI/Platform/Hibernate.cpp
+++ b/rEFIt_UEFI/Platform/Hibernate.cpp
@@ -916,7 +916,7 @@ IsOsxHibernated (IN LOADER_ENTRY *Entry)
               xs8.takeValueFrom(Ptr);
 //              Status = StrToGuidBE(xs8, &TmpGuid);
               TmpGuid.takeValueFromBE(xs8);
-              if (EFI_ERROR(Status)) {
+              if (TmpGuid.isNull()) {
                 DBG("    cant convert Str %ls to EFI_GUID\n", Ptr);
               } else {
                 XStringW TmpStr = TmpGuid.toXStringW();
diff --git a/rEFIt_UEFI/Platform/smbios.cpp b/rEFIt_UEFI/Platform/smbios.cpp
index 8e17bceb2..4ba8c1e97 100755
--- a/rEFIt_UEFI/Platform/smbios.cpp
+++ b/rEFIt_UEFI/Platform/smbios.cpp
@@ -515,7 +515,7 @@ EFI_GUID getSmUUIDFromSmbios()
     DBG("SmbiosTable: Type 1 (System Information) not found!\n");
     return nullGuid;
   }
-  EFI_GUID TmpGuid;
+//  EFI_GUID TmpGuid;
 
 //  XString8 g = GuidBeToXString8(SmbiosTable.Type1->Uuid); // should we use the "variant" field to know if it's LE or BE
   XString8 guidBE = SmbiosTable.Type1->Uuid.toXString8(true); // This is the difference between PC and Mac. the UUID will be swapped (read as a LE, sent as a BE).