diff --git a/src/core/util/llvmdisassembler/LLVMtoFailTranslator.cpp b/src/core/util/llvmdisassembler/LLVMtoFailTranslator.cpp
index 81086632..4a4059fc 100644
--- a/src/core/util/llvmdisassembler/LLVMtoFailTranslator.cpp
+++ b/src/core/util/llvmdisassembler/LLVMtoFailTranslator.cpp
@@ -12,7 +12,7 @@ const LLVMtoFailTranslator::reginfo_t &	 LLVMtoFailTranslator::getFailRegisterIn
 	if ( it != llvm_to_fail_map.end() ) {// found
 		return (*it).second;
 	} else { // not found
-		std::cout << "Fail ID for LLVM Register id " << std::dec << regid << " not found :(" << std::endl;
+		//std::cout << "Fail ID for LLVM Register id " << std::dec << regid << " not found :(" << std::endl;
 		//exit(EXIT_FAILURE);
 		return notfound;
 	}
diff --git a/src/core/util/llvmdisassembler/testing/llvmDisTest.cc b/src/core/util/llvmdisassembler/testing/llvmDisTest.cc
index 63448d97..e307c948 100644
--- a/src/core/util/llvmdisassembler/testing/llvmDisTest.cc
+++ b/src/core/util/llvmdisassembler/testing/llvmDisTest.cc
@@ -5,6 +5,19 @@ using namespace llvm;
 using namespace llvm::object;
 using namespace fail;
 
+bool show_mapping(fail::LLVMtoFailTranslator *ltof, const MCRegisterInfo &reg_info, unsigned llvmid)
+{
+	const LLVMtoFailTranslator::reginfo_t& failreg = ltof->getFailRegisterInfo(llvmid);
+	std::cout << reg_info.getName(llvmid) << "(" << std::dec << llvmid << "->";
+	if (&failreg != &ltof->notfound) {
+		std::cout << failreg.id;
+	} else {
+		std::cout << "NOTFOUND!";
+	}
+	std::cout << ") ";
+	return &failreg != &ltof->notfound;
+}
+
 int main(int argc, char* argv[]) {
 	llvm_shutdown_obj Y;  // Call llvm_shutdown() on exit.
 	// Initialize targets and assembly printers/parsers.
@@ -56,15 +69,13 @@ int main(int argc, char* argv[]) {
 		std::cout << std::dec << "USES: ";
 		for (std::vector<uint16_t>::const_iterator it = instr.reg_uses.begin();
 			 it != instr.reg_uses.end(); ++it) {
-			std::cout << reg_info.getName(*it)
-				<< "(" << *it << "->" << ltof->getFailRegisterID(*it) << ") ";
+			show_mapping(ltof, reg_info, *it);
 		}
 
 		std::cout << " |  DEFS: ";
 		for (std::vector<uint16_t>::const_iterator it = instr.reg_defs.begin();
 			 it != instr.reg_defs.end(); ++it) {
-			std::cout << reg_info.getName(*it)
-				<< "(" << *it << "->" << ltof->getFailRegisterID(*it) << ") ";
+			show_mapping(ltof, reg_info, *it);
 		}
 
 		if (instr.conditional_branch) {