diff --git a/Changelog-mastofe.txt b/Changelog-mastofe.txt
index 7cbdce652..05bda6999 100644
--- a/Changelog-mastofe.txt
+++ b/Changelog-mastofe.txt
@@ -1,3 +1,7 @@
 Based on 2c2f649200ba5b742ba9d17ac5ba553c752b59aa 2019-05-04T10:40:32
 
 Note: This file is to be cleared after each rebase on upstream
+
+Additions
+---------
+- `build.sh`: Add error reporting+failing
diff --git a/build.sh b/build.sh
index 3ac86e339..daefacca7 100755
--- a/build.sh
+++ b/build.sh
@@ -2,19 +2,19 @@
 TARGET="${TARGET:-../pleroma}" # Where pleroma’s repository is sitting
 static_dir="priv/static" # Set this to instance/static when testing production build
 
-if [[ ! -d "${TARGET}/${static_dir}" ]]
-then
-	echo "Error: ${TARGET}/${static_dir} directory is missing, are you sure TARGET is set to a pleroma repository?"
-	echo "Info: TARGET=${TARGET}"
+die() {
+	echo "Die: $@"
 	exit 1
-fi
+}
 
-yarn install -D
+[ -d "${TARGET}/priv/static" ] || die "${TARGET}/priv/static directory is missing, are you sure TARGET is set to a pleroma repository? (Info: TARGET=${TARGET} )"
+
+yarn install -D || die "Installing dependencies via yarn failed"
 
 rm -rf public/packs public/assets
-env -i "PATH=$PATH" npm run build
-cp public/assets/sw.js "${TARGET}/${static_dir}/sw.js"
-rm -rf "${TARGET}/${static_dir}/packs"
-cp -r public/packs "${TARGET}/${static_dir}/packs"
-rm -rf "${TARGET}/${static_dir}/emoji/*.svg"
-cp -r public/emoji/* "${TARGET}/${static_dir}/emoji"
+env -i "PATH=$PATH" npm run build || die "Building the frontend failed"
+cp public/assets/sw.js "${TARGET}/${static_dir}/sw.js" || || die "installing sw.js (service-worker) failed"
+rm -rf "${TARGET}/${static_dir}/packs" || die "Removing old assets in priv/static/packs failed"
+cp -r public/packs "${TARGET}/${static_dir}/packs" || die "Copying new assets in priv/static/packs failed"
+rm -rf "${TARGET}/${static_dir}/emoji/*.svg" || die "Removing the old emoji assets failed"
+cp -r public/emoji/* "${TARGET}/${static_dir}/emoji" || die "Installing the new emoji assets failed"