diff --git a/CHANGES b/CHANGES
index ef65fd37..32160b43 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 October 07, 2011
+* [mickael] WIP: correct wrong input in dump_codec function and add missing return value
 * [mickael] WIP: correct mistake inside set_decoded_area function (credit to Francois De Vieilleville)
 + [mickael] WIP: backport rev 967-969 from opj-1.5 to trunk about test suite enhancement and rename of opj_configh.cmake.in
 
diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c
index e0a2c00c..5b0bf878 100644
--- a/applications/codec/j2k_dump.c
+++ b/applications/codec/j2k_dump.c
@@ -516,7 +516,7 @@ int main(int argc, char *argv[])
 			return EXIT_FAILURE;
 		}
 
-		opj_dump_codec(dinfo, OPJ_IMG_INFO | OPJ_J2K_MH_INFO | OPJ_J2K_MH_IND, stdout );
+		opj_dump_codec(dinfo, OPJ_IMG_INFO | OPJ_J2K_MH_INFO | OPJ_J2K_MH_IND, fout );
 
 		cstr_info = opj_get_cstr_info(dinfo);
 
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 4516c567..32b6d544 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -883,9 +883,11 @@ void OPJ_CALLCONV opj_dump_codec(	opj_codec_t *p_codec,
 		opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
 
 		l_codec->opj_dump_codec(l_codec->m_codec, info_flag, output_stream);
+		return;
 	}
 
 	fprintf(stderr, "[ERROR] Input parameter of the dump_codec function are incorrect.\n");
+	return;
 }
 
 /*