diff --git a/lib/ntbb-database.lib.php b/lib/ntbb-database.lib.php
index e7ee52f58..601cadf9a 100644
--- a/lib/ntbb-database.lib.php
+++ b/lib/ntbb-database.lib.php
@@ -23,12 +23,17 @@ class PSDatabase {
 
 	function connect() {
 		if (!$this->db) {
-			$this->db = new PDO(
-				"mysql:dbname={$this->database};host={$this->server};charset={$this->charset}",
-				$this->username,
-				$this->password
-			);
-			$this->db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+			try {
+				$this->db = new PDO(
+					"mysql:dbname={$this->database};host={$this->server};charset={$this->charset}",
+					$this->username,
+					$this->password
+				);
+				$this->db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+			} catch (Exception $e) {
+				// hide passwords and stuff from stacktrace
+				throw new ErrorException($e->getMessage());
+			}
 		}
 	}
 	function query($query, $params=false) {