diff --git a/src/kits/translation/BitmapStream.cpp b/src/kits/translation/BitmapStream.cpp
index 8c58bf8bc0..c6318249e1 100644
--- a/src/kits/translation/BitmapStream.cpp
+++ b/src/kits/translation/BitmapStream.cpp
@@ -101,8 +101,10 @@ BBitmapStream::~BBitmapStream()
 {
 	if (!fDetached)
 		delete fBitmap;
+	fBitmap = NULL;
 		
 	delete fpBigEndianHeader;
+	fpBigEndianHeader = NULL;
 }
 
 // ---------------------------------------------------------------
diff --git a/src/kits/translation/FuncTranslator.cpp b/src/kits/translation/FuncTranslator.cpp
index 2df52d2885..7e766ea3ad 100644
--- a/src/kits/translation/FuncTranslator.cpp
+++ b/src/kits/translation/FuncTranslator.cpp
@@ -91,10 +91,8 @@ BFuncTranslator::BFuncTranslator(const translator_data *kpData) : BTranslator()
 // ---------------------------------------------------------------
 BFuncTranslator::~BFuncTranslator()
 {
-	if (fpData) {
-		delete fpData;
-		fpData = NULL;
-	}
+	delete fpData;
+	fpData = NULL;
 }
 
 // ---------------------------------------------------------------