diff --git a/templates/template.SlackBuild b/templates/template.SlackBuild
index 5d36b5a..30154b4 100755
--- a/templates/template.SlackBuild
+++ b/templates/template.SlackBuild
@@ -310,12 +310,12 @@ rm -f "$BUILD_WORKDIR/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TA
 makepkg -l y -p -c n --acls --xattrs "$BUILD_WORKDIR/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT" || \
     die "Package creation failed"
 
-# Move package to the store.
-mkdir -p -m 755 "$PKG_STORE" &&
-mv --backup=numbered "$BUILD_WORKDIR/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT" "$PKG_STORE" || \
-    die "Failed to move package to store"
-
 # Clean up after ourselves.
 (( ${BUILD_CLEANUP:-1} == 1 )) && rm -rf "$BUILD_ROOT" "${SRC_DIRNAMES[@]/#/$BUILD_WORKDIR/}"
 
-printf "\\033[1;32m%s:\\n  %s\\033[0;39m\\n" "Package built" "$PKG_STORE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT"
+# Move package to the store.
+mkdir -p -m 755 "$PKG_STORE" && mv --backup=numbered "$BUILD_WORKDIR/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT" \
+    "$PKG_STORE" || die "Failed to move package to store - package left in $BUILD_WORKDIR"
+
+printf "\\033[1;32m%s:\\n  %s\\033[0;39m\\n" "Package built and moved to store" \
+    "$PKG_STORE/$PKG_NAME-${PKG_VERSION//-/_}-$PKG_ARCH-$PKG_BUILD${PKG_TAG//-/_}.$PKG_EXT"