diff --git a/nixinfra/build.sh b/nixinfra/build.sh
index 773bf86..0e5a3da 100755
--- a/nixinfra/build.sh
+++ b/nixinfra/build.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -e
+
 echo "Building '$1'..."
 nix --extra-experimental-features nix-command run github:nix-community/nixos-generators -- --format proxmox --configuration "$1.nix" | tee build.log
 
@@ -8,10 +10,8 @@ fi
 
 echo "Copying file to the output directory..."
 
-# Hack!
-# TODO: Fix this mess later
+# Hacky!
 mkdir -p out/$1
 rm -rf out/$1 out/$1.vma.zst
 OUT_FILE="$(sed -n '$p' build.log)"
-
 cp -r $OUT_FILE out/$1.vma.zst
\ No newline at end of file
diff --git a/nixinfra/buildall.sh b/nixinfra/buildall.sh
index fa23f8f..3b4814f 100755
--- a/nixinfra/buildall.sh
+++ b/nixinfra/buildall.sh
@@ -14,6 +14,11 @@ for FILE in kitteh-node-*/*; do
   if [ ! -f "meta/$FILE.sha" ] || ! diff -q "/tmp/kt-clusterbuild_sha512sum" "meta/$FILE.sha" > /dev/null; then
     ./build.sh $FILE_NO_EXTENSION
 
+    if [ $? -ne 0 ]; then
+      echo "Failed to build, skipping..."
+      continue
+    fi
+
     if ! grep -q "out/$FILE_NO_EXTENSION.vma.zst" meta/tagged_for_upload; then
       echo "out/$FILE_NO_EXTENSION.vma.zst" >> meta/tagged_for_upload
     fi