diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 94b4f2681..cf5d29b1b 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -162,7 +162,7 @@ class PreferenceController extends Zend_Controller_Action
     public function isImportInProgressAction(){
         $now = time();
         $res = false;
-        if(Application_Model_Preference::GetImportTimestamp()+5 > $now){
+        if(Application_Model_Preference::GetImportTimestamp()+10 > $now){
             $res = true;
         }
         die(json_encode($res));
diff --git a/airtime_mvc/application/models/MusicDir.php b/airtime_mvc/application/models/MusicDir.php
index 720c6fc58..3ac977c31 100644
--- a/airtime_mvc/application/models/MusicDir.php
+++ b/airtime_mvc/application/models/MusicDir.php
@@ -244,6 +244,8 @@ class MusicDir {
     {
         if(!is_dir($p_dir)){
             return array("code"=>2, "error"=>"'$p_dir' is not a valid directory.");
+        }else if(Application_Model_Preference::GetImportTimestamp()+10 > $now){
+            return array("code"=>3, "error"=>"Airtime is currently importing files. Please wait until this is complete before changing the storage directory.");
         }
         $dir = self::getStorDir();
         // if $p_dir doesn't exist in DB
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 6e61075e0..f93d0b2ad 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -59,7 +59,7 @@ function checkImportStatus(){
     $.getJSON('/Preference/is-import-in-progress', function(data){
         var div = $('#library_display_processing');
         if(data == true){
-            div.html("Import is being processed");
+            div.html("File import in progress...");
             div.css('visibility', 'visible');
         }else{
             div.css('visibility', 'hidden');
@@ -187,5 +187,5 @@ $(document).ready(function() {
 	}).fnSetFilteringDelay(350);
 	
 	checkImportStatus()
-	setInterval( "checkImportStatus()", 2000 );
+	setInterval( "checkImportStatus()", 5000 );
 });