diff --git a/MBCPApp/mbcpapp.sh b/MBCPApp/mbcpapp.sh
index 9039447..0b9a00e 100755
--- a/MBCPApp/mbcpapp.sh
+++ b/MBCPApp/mbcpapp.sh
@@ -69,7 +69,11 @@ copy_assets() {
     adb shell su -c cp -rf "/data/user/0/com.mbmobile/files/$1" /sdcard/assets
 }
 
-is_unpacked() { [ -d "$DIRPATH"/mbapk/mbapk_unpacked ] ; }
+is_unpacked() {
+    [ -d "$DIRPATH"/mbapk/mbapk_unpacked ] || {
+        echo "ERROR : [mbapk_unpacked] not found ! Please unpack APK first !" ; return 127
+    }
+}
 is_unpacked_lib() {
     [ -d "$DIRPATH"/mbapk/mbapk_unpacked/lib ] || {
         echo "ERROR : [mbapk_unpacked/lib] folder not found ! Please unpack APK first !" ; return 127
@@ -126,8 +130,7 @@ unpack_mbcp() {
 }
 
 repack_mbcp() {
-    apktool_exist
-    is_unpacked || { echo "ERROR : [mbapk_unpacked] folder not found ! Please unpack APK first !" ; return 127 ; }
+    apktool_exist && is_unpacked
     echo "Repacking APK..."
     echo "Compiled by MBCPApp Patcher on $(uname -s -r) with commit $COMMIT at $(date). That's all xD" > 'mbapk/mbapk_unpacked/assets/mbcp_info/mbcpinfo.txt'
     (
@@ -149,10 +152,7 @@ repack_mbcp() {
 }
 
 check_mbshield() {
-    is_unpacked || {
-        echo "[mbapk_unpacked] not found ! Please unpack APK first !"
-        return 1
-    }
+    is_unpacked
     if [ -f "$DIRPATH"/mbapk/mbapk_unpacked/assets/mbshield.szip ]
     then
         echo "$mbshield_found"