diff --git a/ProjectCode/SetupNewSystem.sh b/ProjectCode/SetupNewSystem.sh
index a5e0d87..b8ec605 100644
--- a/ProjectCode/SetupNewSystem.sh
+++ b/ProjectCode/SetupNewSystem.sh
@@ -69,9 +69,9 @@ print_info "Now running "$FUNCNAME"...."
 
 cat ./scripts/up2date.sh > /usr/local/bin/up2date.sh && chmod +x /usr/local/bin/up2date.sh
 
-cd Modules/OAM
+cd ./Modules/OAM || exit
 bash ./oam-librenms.sh
-cd -
+cd - || exit
 
 print_info "Completed running "$FUNCNAME""