diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh
index 69f80ed7..4c0df9bd 100644
--- a/usr/share/rear/lib/layout-functions.sh
+++ b/usr/share/rear/lib/layout-functions.sh
@@ -335,11 +335,9 @@ find_disk() {
 }
 
 find_disk_and_multipath() {
-    res=$(find_disk "$1" ${2+"$2"})
-    if [[ -n "$res" || "$AUTOEXCLUDE_MULTIPATH" =~ ^[yY1] ]]; then
-        echo $res
-    else
-        find_multipath "$1" ${2+"$2"}
+    find_disk "$1" ${2+"$2"}
+    if ! is_true "$AUTOEXCLUDE_MULTIPATH" ; then
+        find_multipath "$1"
     fi
 }