--- a/Core/Toolbox.cpp	Wed Feb 13 17:46:12 2019 +0100
+++ b/Core/Toolbox.cpp	Thu Feb 14 11:32:14 2019 +0100
@@ -518,6 +518,10 @@
         return "ISO-IR-149";
         break;
 
+      case Encoding_JapaneseKanji:
+        return "JIS";
+        break;
+
       default:
         throw OrthancException(ErrorCode_NotImplemented);
     }
@@ -568,9 +572,10 @@
         }        
       }
     }
-    catch (std::runtime_error&)
+    catch (std::runtime_error& e)
     {
       // Bad input string or bad encoding
+      LOG(INFO) << e.what();
       return ConvertToAscii(source);
     }
   }