diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
index 460c35868a..d33a8edb48 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
@@ -179,17 +179,16 @@ angular.module("umbraco.directives")
 					file.uploadStatus = "error";
 
 					//if the service returns a detailed error
-					if(evt.InnerException){
-						file.serverErrorMessage = evt.InnerException.ExceptionMessage;
+					if (evt.InnerException) {
+					    file.serverErrorMessage = evt.InnerException.ExceptionMessage;
 
-						//Check if its the common "too large file" exception
-						if(evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0){
-							file.serverErrorMessage = "File too large to upload";
-						}
-					}
+					    //Check if its the common "too large file" exception
+					    if (evt.InnerException.StackTrace && evt.InnerException.StackTrace.indexOf("ValidateRequestEntityLength") > 0) {
+					        file.serverErrorMessage = "File too large to upload";
+					    }
 
-					if(evt.Message) {
-						file.serverErrorMessage = evt.Message;
+					} else if (evt.Message) {
+					    file.serverErrorMessage = evt.Message;
 					}
 
 					// If file not found, server will return a 404 and display this message
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
index 04d6c0cffe..dc05556bab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html
@@ -79,7 +79,11 @@
 
                <span class="file-error" ng-if="file.$error">
                   <span ng-if="file.$error === 'pattern'" class="errorMessage color-red">(Only allowed file types are: "{{ accept }}")</span>
-                  <span ng-if="file.$error === 'maxSize'" class="errorMessage color-red">(Max file size is " {{ maxFileSize }} ")</span>
+                  <span ng-if="file.$error === 'maxSize'" class="errorMessage color-red">(Max file size is "{{maxFileSize}}")</span>
+               </span>
+
+               <span class="file-error" ng-if="file.serverErrorMessage">
+                   <span class="errorMessage color-red">({{file.serverErrorMessage}})</span>
                </span>
 
             </div>