diff --git a/databases/views.py b/databases/views.py
index 48e679a43..201e3b9a3 100755
--- a/databases/views.py
+++ b/databases/views.py
@@ -217,14 +217,23 @@ def fetchDetailsPHPMYAdmin(request):
         currentACL = ACLManager.loadedACL(userID)
 
         token = request.GET.get('token')
+        username = request.GET.get('username')
 
         if token == 'FailedLogin':
+
+            ## Remove old key and db entry
+
             keySavePath = '/home/cyberpanel/phpmyadmin_%s' % (admin.userName)
-            GlobalUserDB.objects.get(username=admin.userName).delete()
+            try:
+                GlobalUserDB.objects.get(username=admin.userName).delete()
+            except:
+                pass
 
             command = 'rm -f %s' % (keySavePath)
             ProcessUtilities.executioner(command)
 
+            ## Create and save new key
+
             key = Fernet.generate_key()
 
             writeToFile = open(keySavePath, 'w')
@@ -257,9 +266,6 @@ def fetchDetailsPHPMYAdmin(request):
             return redirect(returnURL)
 
 
-        username = request.GET.get('username')
-
-
         if username != admin.userName:
             return redirect(loadLoginPage)
 
diff --git a/plogical/mysqlUtilities.py b/plogical/mysqlUtilities.py
index c3fe06abd..1d46e1971 100755
--- a/plogical/mysqlUtilities.py
+++ b/plogical/mysqlUtilities.py
@@ -933,17 +933,24 @@ skip-name-resolve
                 try:
                     cursor.execute(
                         "CREATE USER '" + user + "'@'%s' IDENTIFIED BY '" % (mysqlUtilities.LOCALHOST) + password + "'")
-                except:
-                    cursor.execute("DROP USER '%s'@'%s'" % (user, mysqlUtilities.LOCALHOST))
-                    cursor.execute(
-                        "CREATE USER '" + user + "'@'%s' IDENTIFIED BY '" % (mysqlUtilities.LOCALHOST) + password + "'")
+                except BaseException as msg:
+                    logging.CyberCPLogFileWriter.writeToFile('%s [addUserToDB:937]' % (str(msg)))
+                    try:
+                        cursor.execute("DROP USER '%s'@'%s'" % (user, mysqlUtilities.LOCALHOST))
+                        cursor.execute(
+                            "CREATE USER '" + user + "'@'%s' IDENTIFIED BY '" % (mysqlUtilities.LOCALHOST) + password + "'")
+                    except BaseException as msg:
+                        logging.CyberCPLogFileWriter.writeToFile('%s [addUserToDB:943]'  % (str(msg)))
 
             if mysqlUtilities.RDS == 0:
                 cursor.execute(
                     "GRANT ALL PRIVILEGES ON " + database + ".* TO '" + user + "'@'%s'" % (mysqlUtilities.LOCALHOST))
             else:
-                cursor.execute(
-                    "GRANT INDEX, DROP, UPDATE, ALTER, CREATE, SELECT, INSERT, DELETE ON " + database + ".* TO '" + user + "'@'%s'" % (mysqlUtilities.LOCALHOST))
+                try:
+                    cursor.execute(
+                        "GRANT INDEX, DROP, UPDATE, ALTER, CREATE, SELECT, INSERT, DELETE ON " + database + ".* TO '" + user + "'@'%s'" % (mysqlUtilities.LOCALHOST))
+                except BaseException as msg:
+                    logging.CyberCPLogFileWriter.writeToFile('%s [addUserToDB:953]' % (str(msg)))
 
             connection.close()
 
diff --git a/plogical/phpmyadminsignin.php b/plogical/phpmyadminsignin.php
index 715d7f141..1ed37f51e 100644
--- a/plogical/phpmyadminsignin.php
+++ b/plogical/phpmyadminsignin.php
@@ -3,6 +3,7 @@
 
 define("PMA_SIGNON_INDEX", 1);
 
+try{
 
 define('PMA_SIGNON_SESSIONNAME', 'SignonSession');
 define('PMA_DISABLE_SSL_PEER_VALIDATION', TRUE);
@@ -43,5 +44,9 @@ else if(isset($_GET['password'])){
 
     header('Location: /phpmyadmin/index.php?server=' . PMA_SIGNON_INDEX);
 }
+}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+}
 
-$url = "/dataBases/fetchDetailsPHPMYAdmin?token=FailedLogin";
\ No newline at end of file
+#$url = "/dataBases/fetchDetailsPHPMYAdmin?token=FailedLogin";
+#header('Location: ' . $url);
\ No newline at end of file