diff --git a/headers/private/package/hpkg/FDCloser.h b/headers/private/package/hpkg/FDCloser.h
index afb4e7b5c2..4661f11d22 100644
--- a/headers/private/package/hpkg/FDCloser.h
+++ b/headers/private/package/hpkg/FDCloser.h
@@ -2,14 +2,16 @@
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _PACKAGE__HPKG__FD_CLOSER_H_
-#define _PACKAGE__HPKG__FD_CLOSER_H_
+#ifndef _PACKAGE__HPKG__PRIVATE__FD_CLOSER_H_
+#define _PACKAGE__HPKG__PRIVATE__FD_CLOSER_H_
 
 
 namespace BPackageKit {
 
 namespace BHPKG {
 
+namespace BPrivate {
+
 
 struct FDCloser {
 	FDCloser(int fd)
@@ -29,9 +31,11 @@ private:
 };
 
 
+}	// namespace BPrivate
+
 }	// namespace BHPKG
 
 }	// namespace BPackageKit
 
 
-#endif	// _PACKAGE__HPKG__FD_CLOSER_H_
+#endif	// _PACKAGE__HPKG__PRIVATE__FD_CLOSER_H_
diff --git a/src/bin/package/command_extract.cpp b/src/bin/package/command_extract.cpp
index d29b089b24..28615b0338 100644
--- a/src/bin/package/command_extract.cpp
+++ b/src/bin/package/command_extract.cpp
@@ -21,7 +21,6 @@
 
 #include <AutoDeleter.h>
 
-#include <package/hpkg/FDCloser.h>
 #include <package/hpkg/PackageContentHandler.h>
 #include <package/hpkg/PackageDataReader.h>
 #include <package/hpkg/PackageEntry.h>
@@ -198,7 +197,6 @@ struct PackageContentExtractHandler : BPackageContentHandler {
 					strerror(errno));
 				return errno;
 		}
-		FDCloser fdCloser(fd);
 
 		// write data
 		status_t error;
@@ -210,10 +208,9 @@ struct PackageContentExtractHandler : BPackageContentHandler {
 		} else
 			error = _ExtractFileData(&fPackageFileReader, data, fd);
 
-		if (error != B_OK)
-			return error;
+		close(fd);
 
-		return B_OK;
+		return error;
 	}
 
 	virtual status_t HandleEntryDone(BPackageEntry* entry)