diff --git a/.SRCINFO b/.SRCINFO
index 7bc04f65180a..b7080f3f7efd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vmangos-git
 	pkgdesc = MMORPG server emulator
 	pkgver = r6390.e37b60804
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/vmangos/
 	install = vmangos-git.install
 	arch = x86_64
@@ -39,6 +39,6 @@ pkgbase = vmangos-git
 	sha256sums = 9d99c70255ec8749a8d59010c53d76c41251783acfccf6c335c5dffa63b5d037
 	sha256sums = c3cee4cb049545cb9c0857f8977120d219d8afcf5c1cb0531546d38ecde98783
 	sha256sums = e2fb357832eda6c7c7467d36251c5c817b79320416a0dd13defe86000349cf2d
-	sha256sums = 0957e84352ad8ca81c9aa97433f97dfe8951d02caa5170702e1a0c3922008eb4
+	sha256sums = 5013febad21ae8cf93966cadedc0736077a3aa9a7edff3bfe58d7f91c625ff54
 
 pkgname = vmangos-git
diff --git a/PKGBUILD b/PKGBUILD
index 6411cf9a9103..7a6a5a00cecd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=vmangos-git
 pkgver=r6390.e37b60804
-pkgrel=2
+pkgrel=3
 pkgdesc="MMORPG server emulator"
 arch=('x86_64')
 url="https://github.com/vmangos/"
@@ -49,7 +49,7 @@ sha256sums=('SKIP'
             '9d99c70255ec8749a8d59010c53d76c41251783acfccf6c335c5dffa63b5d037'
             'c3cee4cb049545cb9c0857f8977120d219d8afcf5c1cb0531546d38ecde98783'
             'e2fb357832eda6c7c7467d36251c5c817b79320416a0dd13defe86000349cf2d'
-            '0957e84352ad8ca81c9aa97433f97dfe8951d02caa5170702e1a0c3922008eb4')
+            '5013febad21ae8cf93966cadedc0736077a3aa9a7edff3bfe58d7f91c625ff54')
 
 pkgver() {
     cd "$srcdir/$pkgname"
diff --git a/vmangos-extract-data.sh b/vmangos-extract-data.sh
index 79e867433f6a..27744e1bbd14 100644
--- a/vmangos-extract-data.sh
+++ b/vmangos-extract-data.sh
@@ -42,8 +42,8 @@ kill_jobs () {
 cleanup_and_exit () {
     kill_jobs
     [[ -d "$DATA_DIR/dbc" ]] && mv "$DATA_DIR/dbc" "$DATA_DIR/5875/dbc"
-    rm -rf "$DATA_DIR/Buildings"
-    rm -rf "$DATA_DIR/Cameras"
+    [[ -d "$DATA_DIR/Buildings" ]] && rm -rf "$DATA_DIR/Buildings"
+    [[ -d "$DATA_DIR/Cameras" ]] && rm -rf "$DATA_DIR/Cameras"
     exit 0
 }