diff --git a/src/dbg/_exports.cpp b/src/dbg/_exports.cpp
index 6fdb262a..44a68ab6 100644
--- a/src/dbg/_exports.cpp
+++ b/src/dbg/_exports.cpp
@@ -354,7 +354,8 @@ extern "C" DLL_EXPORT bool _dbg_addrinfoget(duint addr, SEGMENTREG segment, BRID
             Zydis cp;
             auto getregs = !bOnlyCipAutoComments || addr == lastContext.cip;
             disasmget(cp, addr, &instr, getregs);
-            if(!cp.IsNop())
+            // Some nop variants have 'operands' that should be ignored
+            if(cp.Success() && !cp.IsNop())
             {
                 //Ignore register values when not on CIP and OnlyCipAutoComments is enabled: https://github.com/x64dbg/x64dbg/issues/1383
                 if(!getregs)
diff --git a/src/zydis_wrapper/zydis_wrapper.cpp b/src/zydis_wrapper/zydis_wrapper.cpp
index afabf0f2..0fdff399 100644
--- a/src/zydis_wrapper/zydis_wrapper.cpp
+++ b/src/zydis_wrapper/zydis_wrapper.cpp
@@ -399,7 +399,7 @@ bool Zydis::IsBranchType(std::underlying_type_t<BranchType> bt) const
 ZydisMnemonic Zydis::GetId() const
 {
     if(!Success())
-        DebugBreak();
+        return ZYDIS_MNEMONIC_INVALID;
     return mInstr.mnemonic;
 }