diff --git a/src/Lean/Elab/Tactic/Simp.lean b/src/Lean/Elab/Tactic/Simp.lean
index 8f3bc9eb35..6205171412 100644
--- a/src/Lean/Elab/Tactic/Simp.lean
+++ b/src/Lean/Elab/Tactic/Simp.lean
@@ -137,7 +137,14 @@ inductive ResolveSimpIdResult where
   | none
   | expr (e : Expr)
   | simproc (declName : Name)
-  | ext  (ext₁ : SimpExtension) (ext₂ : Simp.SimprocExtension)
+  /--
+  Recall that when we declare a `simp` attribute using `register_simp_attr`, we automatically
+  create a `simproc` attribute. However, if the user creates `simp` and `simproc` attributes
+  programmatically, then one of them may be missing. Moreover, when we write `simp [seval]`,
+  we want to retrieve both the simp and simproc sets. We want to hide from users that
+  `simp` and `simproc` sets are stored in different data-structures.
+  -/
+  | ext  (ext₁? : Option SimpExtension) (ext₂? : Option Simp.SimprocExtension) (h : ext₁?.isSome || ext₂?.isSome)
 
 /--
   Elaborate extra simp theorems provided to `simp`. `stx` is of the form `"[" simpTheorem,* "]"`
@@ -188,9 +195,13 @@ def elabSimpArgs (stx : Syntax) (ctx : Simp.Context) (simprocs : Simp.SimprocsAr
             thms ← addDeclToUnfoldOrTheorem thms (.stx name arg) e post inv kind
           | .simproc declName =>
             simprocs ← simprocs.add declName post
-          | .ext ext₁ ext₂ =>
+          | .ext (some ext₁) (some ext₂) _ =>
             thmsArray := thmsArray.push (← ext₁.getTheorems)
             simprocs  := simprocs.push (← ext₂.getSimprocs)
+          | .ext (some ext₁) none _ =>
+            thmsArray := thmsArray.push (← ext₁.getTheorems)
+          | .ext none (some ext₂) _ =>
+            simprocs  := simprocs.push (← ext₂.getSimprocs)
           | .none    =>
             let name ← mkFreshId
             thms ← addSimpTheorem thms (.stx name arg) term post inv
@@ -207,9 +218,10 @@ where
 
   resolveSimpIdTheorem? (simpArgTerm : Term) : TacticM ResolveSimpIdResult := do
     let resolveExt (n : Name) : TacticM ResolveSimpIdResult := do
-      if let some ext₁ ← getSimpExtension? n then
-        let some ext₂ ← Simp.getSimprocExtension? n | throwError "simproc set associated with simp set '{n}' was not found"
-        return .ext ext₁ ext₂
+      let ext₁? ← getSimpExtension? n
+      let ext₂? ← Simp.getSimprocExtension? n
+      if h : ext₁?.isSome || ext₂?.isSome then
+        return .ext ext₁? ext₂? h
       else
         return .none
     match simpArgTerm with
diff --git a/src/Lean/Meta/Tactic/Simp/Simproc.lean b/src/Lean/Meta/Tactic/Simp/Simproc.lean
index bd330c4719..221da5f603 100644
--- a/src/Lean/Meta/Tactic/Simp/Simproc.lean
+++ b/src/Lean/Meta/Tactic/Simp/Simproc.lean
@@ -353,8 +353,17 @@ def simpAttrNameToSimprocAttrName (attrName : Name) : Name :=
   else if attrName == `seval then `sevalprocAttr
   else attrName.appendAfter "_proc"
 
-def getSimprocExtension? (simpAttrName : Name) : IO (Option SimprocExtension) :=
-  getSimprocExtensionCore? (simpAttrNameToSimprocAttrName simpAttrName)
+/--
+Try to retrieve the simproc set using the `simp` or `simproc` attribute names.
+Recall that when we declare a `simp` set using `register_simp_attr`, an associated
+`simproc` set is automatically created. We use the function `simpAttrNameToSimprocAttrName` to
+find the `simproc` associated with the `simp` attribute.
+-/
+def getSimprocExtension? (simprocAttrNameOrsimpAttrName : Name)
+    : IO (Option SimprocExtension) := do
+  let some ext ← getSimprocExtensionCore? simprocAttrNameOrsimpAttrName
+    | getSimprocExtensionCore? (simpAttrNameToSimprocAttrName simprocAttrNameOrsimpAttrName)
+  return some ext
 
 def SimprocExtension.getSimprocs (ext : SimprocExtension) : CoreM Simprocs :=
   return ext.getState (← getEnv)