diff --git a/app/configuration/controllers/firmware-controller.html b/app/configuration/controllers/firmware-controller.html
index dc85606..c30b4d2 100644
--- a/app/configuration/controllers/firmware-controller.html
+++ b/app/configuration/controllers/firmware-controller.html
@@ -46,6 +46,7 @@
 					</div>
 				</div>
 				<div class="inline uploading" ng-show="downloading">Downloading in progress...</div>
+				<p class="download_error error-msg" ng-show="download_error_msg" role="alert">{{download_error_msg}}</p>
 			</fieldset>
 		</div>
 	</form>
diff --git a/app/configuration/controllers/firmware-controller.js b/app/configuration/controllers/firmware-controller.js
index 127a7c2..29d0412 100644
--- a/app/configuration/controllers/firmware-controller.js
+++ b/app/configuration/controllers/firmware-controller.js
@@ -49,6 +49,7 @@
                     $scope.file_empty = true;
                     $scope.uploading = false;
                     $scope.activate = { reboot: true };
+                    $scope.download_error_msg = "";
 
                     var pollActivationTimer = undefined;
 
@@ -156,6 +157,11 @@
                     }
 
                     $scope.download = function(){
+                        $scope.download_error_msg = "";
+                        if(!$scope.download_host || !$scope.download_filename){
+                            $scope.download_error_msg = "Field is required!";
+                            return false;
+                        }
                         $scope.downloading = true;
                         APIUtils.downloadImage($scope.download_host, $scope.download_filename).then(function(response){
                             var data = response.data;