diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index ee9eea356..06e788095 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -238,7 +238,7 @@ class Application_Model_StoredFile {
      * 		'empty'|'incomplete'|'ready'|'edited'
      * @param int $p_editedby
      * 		 user id | 'NULL' for clear editedBy field
-     * @return TRUE|PEAR_Error
+     * @return TRUE
      */
     public function setState($p_state, $p_editedby=NULL)
     {
diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install
index e063cdd63..18881796b 100755
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@@ -39,7 +39,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
 libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
 libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
 php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
-libpulse0 vorbis-tools lsb-release php-db
+libpulse0 vorbis-tools lsb-release 
 
 #install packages with --force-yes option (this is useful in the case
 #of Debian, where these packages are unauthorized)
diff --git a/install_full/ubuntu/airtime-full-install-nginx b/install_full/ubuntu/airtime-full-install-nginx
index d05e5e978..2466ff33e 100755
--- a/install_full/ubuntu/airtime-full-install-nginx
+++ b/install_full/ubuntu/airtime-full-install-nginx
@@ -42,7 +42,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
 libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
 libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
 php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
-libpulse0 vorbis-tools lsb-release php-db
+libpulse0 vorbis-tools lsb-release 
 
 #install packages with --force-yes option (this is useful in the case
 #of Debian, where these packages are unauthorized)
diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 5af33878c..107a002da 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -69,13 +69,12 @@ class AirtimeInstall
         }
 
         if ($version == '') {
-            $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
-            $result = $con->query($sql)->fetchColumn(0);
-            if (!PEAR::isError($result)) {
+            try {
+                // If this table exists, then it's 1.7.0
+                $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
+                $result = $con->query($sql)->fetchColumn(0);
                 $version = "1.7.0";
-                //echo "Airtime Version: ".$version." ".PHP_EOL;
-            }
-            else {
+            } catch (Exception $e) {
                 $version = null;
             }
         }