diff --git a/Classes/BITHockeyBaseManager.m b/Classes/BITHockeyBaseManager.m
index 434a596c85..c335662942 100644
--- a/Classes/BITHockeyBaseManager.m
+++ b/Classes/BITHockeyBaseManager.m
@@ -38,9 +38,8 @@
 #import "BITKeychainUtils.h"
 
 #import <sys/sysctl.h>
-#if !TARGET_IPHONE_SIMULATOR
-#import <mach-o/ldsyms.h>
-#endif
+#import <mach-o/dyld.h>
+#import <mach-o/loader.h>
 
 #ifndef __IPHONE_6_1
 #define __IPHONE_6_1     60100
@@ -134,29 +133,38 @@
 }
 
 - (NSString *)executableUUID {
-  // This now requires the testing of this feature to be done on an actual device, since it returns always empty strings on the simulator
-  // Once there is a better solution to get unit test targets build without problems this should be changed again, so testing of this
-  // feature is also possible using the simulator
-  // See: http://support.hockeyapp.net/discussions/problems/2306-integrating-hockeyapp-with-test-bundle-target-i386-issues
-  //      http://support.hockeyapp.net/discussions/problems/4113-linking-hockeysdk-to-test-bundle-target
-#if !TARGET_IPHONE_SIMULATOR
-  const uint8_t *command = (const uint8_t *)(&_mh_execute_header + 1);
-  for (uint32_t idx = 0; idx < _mh_execute_header.ncmds; ++idx) {
-    const struct load_command *load_command = (const struct load_command *)command;
-    if (load_command->cmd == LC_UUID) {
-      const struct uuid_command *uuid_command = (const struct uuid_command *)command;
-      const uint8_t *uuid = uuid_command->uuid;
+  const struct mach_header *executableHeader = NULL;
+  for (uint32_t i = 0; i < _dyld_image_count(); i++) {
+    const struct mach_header *header = _dyld_get_image_header(i);
+    if (header->filetype == MH_EXECUTE) {
+      executableHeader = header;
+      break;
+    }
+  }
+  
+  if (!executableHeader)
+    return @"";
+  
+#ifdef __LP64__
+  uintptr_t cursor = (uintptr_t)executableHeader + sizeof(struct mach_header_64);
+#else
+  uintptr_t cursor = (uintptr_t)executableHeader + sizeof(struct mach_header);
+#endif
+  const struct segment_command *segmentCommand = NULL;
+  for (uint32_t i = 0; i < executableHeader->ncmds; i++, cursor += segmentCommand->cmdsize) {
+    segmentCommand = (struct segment_command *)cursor;
+    if (segmentCommand->cmd == LC_UUID) {
+      const struct uuid_command *uuidCommand = (const struct uuid_command *)segmentCommand;
+      const uint8_t *uuid = uuidCommand->uuid;
       return [[NSString stringWithFormat:@"%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
                uuid[0], uuid[1], uuid[2], uuid[3],
                uuid[4], uuid[5], uuid[6], uuid[7],
                uuid[8], uuid[9], uuid[10], uuid[11],
                uuid[12], uuid[13], uuid[14], uuid[15]]
               lowercaseString];
-    } else {
-      command += load_command->cmdsize;
     }
   }
-#endif
+  
   return @"";
 }
 
diff --git a/Classes/BITStoreUpdateManager.m b/Classes/BITStoreUpdateManager.m
index 0536f17830..78a0bcef1d 100644
--- a/Classes/BITStoreUpdateManager.m
+++ b/Classes/BITStoreUpdateManager.m
@@ -155,7 +155,7 @@
   if ([self.userDefaults objectForKey:kBITStoreUpdateLastUUID]) {
     lastSavedUUID = [self.userDefaults objectForKey:kBITStoreUpdateLastUUID];
 
-    if (lastSavedUUID && ![lastSavedUUID isEqualToString:_currentUUID]) {
+    if (lastSavedUUID && [lastSavedUUID length] > 0 && ![lastSavedUUID isEqualToString:_currentUUID]) {
       // the UUIDs don't match, store the new one
       [self.userDefaults setObject:_currentUUID forKey:kBITStoreUpdateLastUUID];
       
diff --git a/Support/HockeySDKTests/BITStoreUpdateManagerTests.m b/Support/HockeySDKTests/BITStoreUpdateManagerTests.m
index ffff07bfed..897ec761f1 100644
--- a/Support/HockeySDKTests/BITStoreUpdateManagerTests.m
+++ b/Support/HockeySDKTests/BITStoreUpdateManagerTests.m
@@ -300,7 +300,7 @@
   STAssertFalse(result, @"The newer version is being ignored");
 }
 
-- (void)testReportedVersionIsNewerThanTHeIgnoredVersion {
+- (void)testReportedVersionIsNewerThanTheIgnoredVersion {
   NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.1"];
   [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];