diff --git a/src/arch/x86/faults.hh b/src/arch/x86/faults.hh
index 6d89c273a..8c9afcdb5 100644
--- a/src/arch/x86/faults.hh
+++ b/src/arch/x86/faults.hh
@@ -65,12 +65,32 @@ namespace X86ISA
 {
     class X86Fault : public FaultBase
     {
+      protected:
+        const char * name()
+        {
+            return "generic_x86_fault";
+        }
+
         void invoke(ThreadContext * tc)
         {
             panic("X86 faults are not implemented!");
         }
     };
 
+    class UnimpInstFault : public FaultBase
+    {
+      public:
+        const char * name()
+        {
+            return "unimplemented_micro";
+        }
+
+        void invoke(ThreadContext * tc)
+        {
+            panic("Unimplemented instruction!");
+        }
+    };
+
     static inline Fault genPageTableFault(Addr va)
     {
         panic("Page table fault not implemented in x86!\n");