diff --git a/apps/decoder.c b/apps/decoder.c
index 84bf978451424ff78b3e3023e6b53f16705c6953..496c0b860333ea99d2f11072b6b0544850a54f7e 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -2423,7 +2423,11 @@ static ivas_error decodeG192(
                 {
                     if ( ( error = TsmScaleFileReader_readScale( tsmScaleFileReader, &scale ) ) != IVAS_ERR_OK )
                     {
+#ifdef FIX_699_FILE_READER_JBM_TSM
+                        fprintf( stderr, "\nError (%s) when reading TSM data from %s \n\n", arg.inputBitstreamFilename, TsmScaleFileReader_getFilePath( tsmScaleFileReader ) );
+#else
                         fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename );
+#endif
                         goto cleanup;
                     }
                     int16_t maxScaling;
diff --git a/apps/encoder.c b/apps/encoder.c
index dfd3da593b6a265c932d4316e5cfc9dcc36e91fc..bf9302d439b5a6f245576928f6e3e66fbddd2ad6 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -709,7 +709,11 @@ int main(
         {
             if ( ( error = JbmFileReader_readCAconfig( jbmReader, &caConfig ) ) != IVAS_ERR_OK )
             {
+#ifdef FIX_699_FILE_READER_JBM_TSM
+                fprintf( stderr, "\nError (%s) while reading Channel-Aware Config. from: %s\n\n", IVAS_ENC_GetErrorMessage( error ), JbmFileReader_getFilePath( jbmReader ) );
+#else
                 fprintf( stderr, "JbmFileReader_readCAconfig() failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
+#endif
                 goto cleanup;
             }
 
diff --git a/lib_com/options.h b/lib_com/options.h
index c334f272e06347af343528fa689233c91aa6164b..bc27dc91b0d09ca43f096d99fde2d71c3bfbc633 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -219,7 +219,8 @@
 
 #define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */
 #define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */
-#define NONBE_FIX_1000_G1_G2_SWB_TBE                          /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */
+#define NONBE_FIX_1000_G1_G2_SWB_TBE                    /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */
+#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_util/tsm_scale_file_reader.c b/lib_util/tsm_scale_file_reader.c
index 3b9a2895add15be06ed757f719e45ae9463f18bf..e61f80763ddab05f01a294ae510e2059f8d0c6b3 100644
--- a/lib_util/tsm_scale_file_reader.c
+++ b/lib_util/tsm_scale_file_reader.c
@@ -36,6 +36,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef DEBUGGING
+#ifdef VARIABLE_SPEED_DECODING
+
 struct TsmScaleFileReader
 {
     FILE *file;
@@ -146,3 +149,6 @@ const char *TsmScaleFileReader_getFilePath(
 
     return self->file_path;
 }
+
+#endif
+#endif
diff --git a/lib_util/tsm_scale_file_reader.h b/lib_util/tsm_scale_file_reader.h
index 7c5cb051d62741e6ea28a8278fe3678532144664..897e15681b413d8fe18e49851f464076ba2a37d4 100644
--- a/lib_util/tsm_scale_file_reader.h
+++ b/lib_util/tsm_scale_file_reader.h
@@ -36,6 +36,8 @@
 #include "common_api_types.h"
 
 /* clang-format off */
+#ifdef DEBUGGING
+#ifdef VARIABLE_SPEED_DECODING
 
 typedef struct TsmScaleFileReader TsmScaleFileReader;
 
@@ -59,6 +61,8 @@ const char *TsmScaleFileReader_getFilePath(
     TsmScaleFileReader* self                 /* i/o: TsmScaleFileReader handle              */
 );
 
+#endif
+#endif
 /* clang-format on */
 
 #endif /* IVAS_TSM_SCALE_FILE_READER_H */