diff --git a/src/bin/setmime.cpp b/src/bin/setmime.cpp
index 8078c6099e..113973117f 100644
--- a/src/bin/setmime.cpp
+++ b/src/bin/setmime.cpp
@@ -723,8 +723,8 @@ MimeType::_PurgeProperties()
 	delete fBigIcon;
 	fBigIcon = NULL;
 
-	fVectorIcon = NULL;
 	free(fVectorIcon);
+	fVectorIcon = NULL;
 
 	fExtensions.clear();
 	fAttributes.clear();
diff --git a/src/kits/package/hpkg/PackageFileHeapWriter.cpp b/src/kits/package/hpkg/PackageFileHeapWriter.cpp
index 17a7e94514..7d1f7acf3f 100644
--- a/src/kits/package/hpkg/PackageFileHeapWriter.cpp
+++ b/src/kits/package/hpkg/PackageFileHeapWriter.cpp
@@ -162,7 +162,7 @@ private:
 			return fUnusedBuffers.RemoveItem(fUnusedBuffers.CountItems() - 1);
 
 		void* buffer = malloc(fBufferSize);
-		if (buffer == NULL && !fBuffers.AddItem(buffer)) {
+		if (buffer == NULL || !fBuffers.AddItem(buffer)) {
 			free(buffer);
 			throw std::bad_alloc();
 		}
diff --git a/src/system/libroot/os/driver_settings.cpp b/src/system/libroot/os/driver_settings.cpp
index 9004095dac..212a2ecff5 100644
--- a/src/system/libroot/os/driver_settings.cpp
+++ b/src/system/libroot/os/driver_settings.cpp
@@ -457,8 +457,6 @@ load_driver_settings_from_file(int file, const char *driverName)
 				// everything went fine!
 				return handle;
 			}
-
-			free(handle);
 		}
 		// "text" might be NULL here, but that's allowed
 		free(text);
diff --git a/src/tools/fs_shell/driver_settings.cpp b/src/tools/fs_shell/driver_settings.cpp
index 01547f7560..6084ff9eaf 100644
--- a/src/tools/fs_shell/driver_settings.cpp
+++ b/src/tools/fs_shell/driver_settings.cpp
@@ -423,8 +423,6 @@ load_driver_settings_from_file(int file, const char *driverName)
 				// everything went fine!
 				return handle;
 			}
-
-			free(handle);
 		}
 		// "text" might be NULL here, but that's allowed
 		free(text);