diff --git a/oni-yasnippet.el b/oni-yasnippet.el
index 1e4d7f2..584d909 100644
--- a/oni-yasnippet.el
+++ b/oni-yasnippet.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.0712.232619
+;; Version: 2023.1212.085307
 ;; Package-Requires: (yasnippet yasnippet-snippets diminish)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -36,11 +36,11 @@
 
 (defun oni-yasnippet-remove-snippet-by-name (name mode)
   "Remove the snippet NAME from MODE's snippet tables."
-  (let* ((mode-table (gethash mode yas--tables))
-         (uuidhash-table (yas--table-uuidhash mode-table))
-         (hash-table (yas--table-hash mode-table))
-         (snippet (gethash name uuidhash-table))
-         (key (yas--template-key snippet)))
+  (and-let* ((mode-table (gethash mode yas--tables))
+             (uuidhash-table (yas--table-uuidhash mode-table))
+             (hash-table (yas--table-hash mode-table))
+             (snippet (gethash name uuidhash-table))
+             (key (yas--template-key snippet)))
     (remhash key hash-table)
     (remhash name uuidhash-table)))