diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp
index c58bd182..98e421dc 100644
--- a/oscar/SleepLib/profiles.cpp
+++ b/oscar/SleepLib/profiles.cpp
@@ -94,14 +94,6 @@ Profile::~Profile()
         removeLock();
     }
 
-    delete user;
-    delete doctor;
-    delete cpap;
-    delete oxi;
-    delete appearance;
-    delete session;
-    delete general;
-
     // delete machine objects...
     for (auto & mach : m_machlist) {
         delete mach;
@@ -111,6 +103,13 @@ Profile::~Profile()
         delete day;
     }
 
+    delete user;
+    delete doctor;
+    delete cpap;
+    delete oxi;
+    delete appearance;
+    delete session;
+    delete general;
 }
 
 bool Profile::Save(QString filename)
diff --git a/oscar/tests/resmedtests.cpp b/oscar/tests/resmedtests.cpp
index 865bb0f5..6c6eb0c1 100644
--- a/oscar/tests/resmedtests.cpp
+++ b/oscar/tests/resmedtests.cpp
@@ -30,9 +30,9 @@ void ResmedTests::initTestCase(void)
 void ResmedTests::cleanupTestCase(void)
 {
     delete AppSetting;
-    delete p_pref;
     delete p_profile;
     p_profile = nullptr;
+    delete p_pref;
 }