diff --git a/cursors/meson.build b/cursors/meson.build
index 1b5eab6d3..4adcf9940 100644
--- a/cursors/meson.build
+++ b/cursors/meson.build
@@ -85,7 +85,7 @@ sizes = [
 ]
 
 foreach size: sizes
-    run_command('mkdir', join_paths (meson.build_root(), 'cursors', size + 'x' + size))
+    run_command('mkdir', join_paths (meson.build_root(), 'cursors', size + 'x' + size), check: true)
 
     foreach cursor : cursors
             message('rendering: ' + size + 'x' + size + '/' + cursor + '.png')
@@ -94,7 +94,8 @@ foreach size: sizes
                 rsvg, '--format', 'png',
                 '--width=@0@'.format(size), '--height=@0@'.format(size),
                 '--output', '@0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, cursor)),
-                join_paths ('24', cursor + '.svg')
+                join_paths ('24', cursor + '.svg'),
+                check: true
             )
     endforeach
 
@@ -105,7 +106,8 @@ foreach size: sizes
                 rsvg, '--format', 'png',
                 '--width=@0@'.format(size), '--height=@0@'.format(size),
                 '--output', '@0@.png'.format(join_paths (meson.build_root(), 'cursors', size + 'x' + size, watch)),
-                join_paths ('24', watch + '.svg')
+                join_paths ('24', watch + '.svg'),
+                check: true
             )
     endforeach
 endforeach
@@ -122,7 +124,8 @@ foreach cursor : cursors
         xcursorgen,
         cursor + '.in',
         '-p', join_paths (meson.build_root(), 'cursors'),
-        join_paths (meson.build_root(), 'cursors', cursor)
+        join_paths (meson.build_root(), 'cursors', cursor),
+        check: true
     )
 
     install_data(
diff --git a/meson.build b/meson.build
index 1ce46ccab..caa8b1aef 100644
--- a/meson.build
+++ b/meson.build
@@ -5,6 +5,7 @@ project (
 )
 
 i18n = import('i18n')
+fs = import('fs')
 
 icon_dir = join_paths(get_option('datadir'), 'icons', 'elementary')
 
@@ -91,8 +92,8 @@ foreach directory_entry : directories
     directory = directory_entry[0]
     directory_context = directory_entry[1]
     foreach size: sizes
-        result = run_command(ls, join_paths(meson.source_root (), directory, size))
-        if (result.returncode() == 0)
+        dir_exists = fs.is_dir(join_paths(meson.source_root (), directory, size))
+        if dir_exists
             foreach scale_factor : scale_factors
                 # The Scale=1 attribute is useless, don't add it
                 if (scale_factor.to_int() > 1)