diff --git a/drivers/MysqliDriver.inc b/drivers/MysqliDriver.inc
index 9520fa1e..fe4fa81a 100644
--- a/drivers/MysqliDriver.inc
+++ b/drivers/MysqliDriver.inc
@@ -82,10 +82,12 @@
 				}
 				
 				
+				$stmt->close();
 				return $data;
 			}
-			finally {
-				$stmt->close();
+			catch(Exception $e) {
+				$stmt->close(); 
+				throw $e;
 			}
 		}
 		
diff --git a/models/UsersModel.inc b/models/UsersModel.inc
index 0456a7ec..e8b01a52 100644
--- a/models/UsersModel.inc
+++ b/models/UsersModel.inc
@@ -190,11 +190,10 @@
 			}
 			catch(Exception $e) {
 				$this->db->rollback();
+				$this->db->setAutocommit(true);
 				throw $e;
 			}
-			finally {
-				$this->db->setAutocommit(true);
-			}
+			$this->db->setAutocommit(true);
 		}