diff --git a/41_snapshots-btrfs b/41_snapshots-btrfs
index add2b37..52ae310 100644
--- a/41_snapshots-btrfs
+++ b/41_snapshots-btrfs
@@ -55,9 +55,7 @@ print_error()
 [[ "${GRUB_BTRFS_DISABLE,,}" == "true" ]] && print_error "GRUB_BTRFS_DISABLE is set to true (default=false)"
 if ! type btrfs >/dev/null 2>&1; then print_error "btrfs-progs isn't installed"; fi
 [[ -f "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}" ]] && . "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}" || print_error "grub-mkconfig_lib couldn't be found"
-root_fs=$(${grub_probe} --target="fs" / 2>/dev/null)
-[[ "$root_fs" != "btrfs" ]] && print_error "Root filesystem isn't btrfs"
-
+[[ "$(${grub_probe} --target="fs" / 2>/dev/null)" != "btrfs" ]] && print_error "Root filesystem isn't btrfs"
 
 printf "Detecting snapshots ...\n" >&2 ;
 
diff --git a/grub-btrfsd b/grub-btrfsd
index 4bdd0a3..c35b181 100755
--- a/grub-btrfsd
+++ b/grub-btrfsd
@@ -190,11 +190,17 @@ while true; do
                 log "Detected snapshot creation/ deletion, recreating Grub menu" "${CYAN}"
                 sleep 5
                 if [ -s "${GRUB_BTRFS_GRUB_DIRNAME:-/boot/grub}/grub-btrfs.cfg" ]; then
-                    /etc/grub.d/41_snapshots-btrfs
-                    log "Grub submenu recreated" "${GREEN}"
+                    if /etc/grub.d/41_snapshots-btrfs; then
+						log "Grub submenu recreated" "${GREEN}"
+                    else
+						err "[!] Error during grub submenu creation (grub-btrfs error)" "${RED}"
+                    fi
                 else
-                    ${GRUB_BTRFS_MKCONFIG:-grub-mkconfig} -o ${GRUB_BTRFS_GRUB_DIRNAME:-/boot/grub}/grub.cfg
-                    log "Grub menu recreated" "${GREEN}"
+                    if ${GRUB_BTRFS_MKCONFIG:-grub-mkconfig} -o ${GRUB_BTRFS_GRUB_DIRNAME:-/boot/grub}/grub.cfg; then
+                        log "Grub menu recreated" "${GREEN}"
+                    else
+                        err "[!] Error during grub menu creation (grub/ grub-btrfs error)" "${RED}"
+                    fi
                 fi
             }
             sleep 1