diff --git a/Scripts/terminal_server_setup.py b/Scripts/terminal_server_setup.py
index 9ebf11b..8fa0ce7 100644
--- a/Scripts/terminal_server_setup.py
+++ b/Scripts/terminal_server_setup.py
@@ -1,16 +1,31 @@
 import sys
 import os
 #install packages
-package_list = ['paramiko','dlipower','pytest','scp','jq']
-for package_name in package_list:
+package_list1 = ['paramiko','dlipower','pytest','scp']
+package_list2 = ['git','jq']
+for package_name in package_list1:
     try:
         os.system('sudo pip install '+package_name)
         print("------------INSTALLED: "+package_name+"-------------")
-    except:
+    except Exception as e:
         print("Cannot install "+package_name)
-        if package_name=="jq":
-            print("Try running: sudo yum install jq")
+        print("Try running: sudo yum install "+package_name)
+        print(e)
+
+for package_name in package_list2:
+    try:
+        os.system('sudo yum install '+package_name)
+        print("------------INSTALLED: "+package_name+"-------------")
+    except Exception as e:
+        print("Cannot install "+package_name)
+        print("Try running: sudo pip install "+package_name)
+        print(e)
+
 
 #copy openwrt_ctl.py file
-os.system('cd cicd-git/;git clone https://github.com/Telecominfraproject/wlan-testing/; cp /home/lanforge/cicd-git/wlan-testing/libs/apnos/openwrt_ctl.py .;rm -rf wlan-testing/;cd ../')
-print("openwrt_ctl.py file copied")
\ No newline at end of file
+try:
+    os.system('cd cicd-git/;git clone https://github.com/Telecominfraproject/wlan-testing/; cp wlan-testing/libs/apnos/openwrt_ctl.py .;rm -rf wlan-testing/;cd ../')
+    print("openwrt_ctl.py file copied")
+except Exception as e:
+    print(e)
+    print("Check with lab admin if terminal server can be connected to")