diff --git a/samples/winapi_drivelist/main.c b/samples/winapi_drivelist/main.c
index 854ae7d98..6dfa3034d 100644
--- a/samples/winapi_drivelist/main.c
+++ b/samples/winapi_drivelist/main.c
@@ -9,45 +9,46 @@ int main(void)
 
     // Mount some drives for demonstration purposes
     BOOL ret;
+    DWORD error;
     ret = nxMountDrive('C', "\\Device\\Harddisk0\\Partition2\\");
     if (!ret) {
-        debugPrint("Failed to mount C: drive!\n");
-        Sleep(5000);
-        return 1;
+        // Additional error info can be retrieved with GetLastError()
+        error = GetLastError();
+        debugPrint("Failed to mount C: drive! Error code: %x\n", error);
+        goto sleepForever;
     }
+
     ret = nxMountDrive('E', "\\Device\\Harddisk0\\Partition1\\");
     if (!ret) {
-        debugPrint("Failed to mount E: drive!\n");
-        Sleep(5000);
-        return 1;
+        error = GetLastError();
+        debugPrint("Failed to mount E: drive! Error code: %x\n", error);
+        goto unmount_c;
     }
 
-    // Retrieve drive bitmaks. Every bit represents one drive letter
+    // Retrieve drive bitmasks. Every bit represents one drive letter
     DWORD driveBits = GetLogicalDrives();
-    if (driveBits == 0 && GetLastError() != ERROR_SUCCESS) {
-        debugPrint("Failed to retrieve drive bitmask!\n");
-        Sleep(5000);
-        return 1;
+    error = GetLastError();
+    if (driveBits == 0 && error != ERROR_SUCCESS) {
+        debugPrint("Failed to retrieve drive bitmask! Error code: %x\n", error);
+        goto cleanup;
     }
-    debugPrint("Drive bitmask: 0x%lx\n\n", driveBits);
 
+    debugPrint("Drive bitmask: 0xl%x\n\n", driveBits);
 
     // Reserve buffer long enough for all possible drive strings plus null-terminator
     char buffer[26 * 4 + 1];
     // IMPORTANT: The size passed to GetLogicalDriveStringsA is WITHOUT the null-terminator, even though it gets written
     DWORD charsWritten = GetLogicalDriveStringsA(sizeof(buffer)-1, buffer);
     if (charsWritten == 0) {
-        // Additional error info can be retrieved with GetLastError()
-        debugPrint("Failed to retrieve drive strings!\n");
-        Sleep(5000);
-        return 1;
+        error = GetLastError();
+        debugPrint("Failed to retrieve drive strings! Error code: %x\n", error);
+        goto cleanup;
     }
 
     if (charsWritten > sizeof(buffer) - 1) {
         // Can't happen here as our buffer is large enough to cover all possibilities
         debugPrint("Buffer for GetLogicalDriveStringsA too small!\n");
-        Sleep(5000);
-        return 1;
+        goto cleanup;
     }
 
     debugPrint("Drives found:\n");
@@ -56,9 +57,25 @@ int main(void)
         debugPrint("%s\n", drive);
         while(*drive++);
     }
-    debugPrint("\ndone");
 
-    while(1) {
+    debugPrint("\nDone!");
+
+cleanup:
+    ret = nxUnmountDrive('E');
+    if (!ret) {
+        error = GetLastError();
+        debugPrint("\nFailed to unmount E: drive! Error code: %x\n", error);
+    }
+
+unmount_c:
+    ret = nxUnmountDrive('C');
+    if (!ret) {
+        error = GetLastError();
+        debugPrint("\nFailed to unmount C: drive! Error code: %x\n", error);
+    }
+
+sleepForever:
+    while (1) {
         Sleep(2000);
     }
 
diff --git a/samples/winapi_filefind/main.c b/samples/winapi_filefind/main.c
index 984df7108..3732ee0c2 100644
--- a/samples/winapi_filefind/main.c
+++ b/samples/winapi_filefind/main.c
@@ -10,12 +10,16 @@ int main(void)
 {
     XVideoSetMode(640, 480, 32, REFRESH_DEFAULT);
 
+    DWORD error;
+
     // Mount C:
     BOOL ret = nxMountDrive('C', "\\Device\\Harddisk0\\Partition2\\");
+
     if (!ret) {
-        debugPrint("Failed to mount C: drive!\n");
-        Sleep(5000);
-        return 1;
+        // There was an error. We can get more information about an error from WinAPI code using GetLastError()
+        error = GetLastError();
+        debugPrint("Failed to mount C: drive! Error code: %x\n", error);
+        goto sleepForever;
     }
 
     debugPrint("Content of C:\\\n");
@@ -27,9 +31,9 @@ int main(void)
     // no matter whether they contain a dot or not
     hFind = FindFirstFile("C:\\*.*", &findFileData);
     if (hFind == INVALID_HANDLE_VALUE) {
-        debugPrint("FindFirstHandle() failed!\n");
-        Sleep(5000);
-        return 1;
+        error = GetLastError();
+        debugPrint("FindFirstHandle() failed! Error code: %x\n", error);
+        goto cleanup;
     }
 
     do {
@@ -38,21 +42,28 @@ int main(void)
         } else {
             debugPrint("File     : ");
         }
-
         debugPrint("%s\n", findFileData.cFileName);
     } while (FindNextFile(hFind, &findFileData) != 0);
 
     debugPrint("\n");
 
-    DWORD error = GetLastError();
+    error = GetLastError();
     if (error == ERROR_NO_MORE_FILES) {
         debugPrint("Done!\n");
     } else {
-        debugPrint("error: %lx\n", error);
+        debugPrint("Error: %lx\n", error);
     }
 
     FindClose(hFind);
 
+cleanup:
+    ret = nxUnmountDrive('C');
+    // If there was an error while unmounting
+    if (!ret) {
+        error = GetLastError();
+        debugPrint("Failed to unmount C: drive! Error code: %x", error);
+    }
+sleepForever:
     while (1) {
         Sleep(2000);
     }