diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index 3596d0bd11d..11b6cfb0c5f 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -1827,9 +1827,9 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
     }
 
     public BackupProvider getBackupProvider(final String name) {
-        if (StringUtils.isEmpty(name)) {
-            throw new CloudRuntimeException("Invalid backup provider name provided");
-        }
+       if (StringUtils.isEmpty(name)) {
+           throw new CloudRuntimeException("Invalid backup provider name provided");
+       }
        if (!backupProvidersMap.containsKey(name)) {
            throw new CloudRuntimeException("Failed to find backup provider by the name: " + name);
        }
diff --git a/server/src/main/java/org/apache/cloudstack/backup/KVMBackupExportServiceImpl.java b/server/src/main/java/org/apache/cloudstack/backup/KVMBackupExportServiceImpl.java
index 37a84de8e0e..c9854d0a0ea 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/KVMBackupExportServiceImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/KVMBackupExportServiceImpl.java
@@ -139,9 +139,12 @@ public class KVMBackupExportServiceImpl extends ManagerBase implements KVMBackup
     VmWorkJobHandlerProxy jobHandlerProxy = new VmWorkJobHandlerProxy(this);
 
     private void verifyKVMBackupExportServiceSupported(Long zoneId) {
-        if (BackupFrameworkEnabled.value() && !StringUtils.equals("dummy", BackupProviderPlugin.valueIn(zoneId))) {
-            throw new CloudRuntimeException("Veeam-KVM integration can not be used along with the " + BackupProviderPlugin.valueIn(zoneId) +
-                    " backup provider. Either set backup.framework.enabled to false or set the Zone level config backup.framework.provider.plugin to \"dummy\".");
+        if (BackupFrameworkEnabled.value() &&
+                !StringUtils.equals("dummy", BackupProviderPlugin.valueIn(zoneId)) &&
+                !StringUtils.equals("veeam", BackupProviderPlugin.valueIn(zoneId))) {
+            throw new CloudRuntimeException("Veeam-KVM backups are disabled because the CloudStack Zone is configured to use the \"" +
+                    BackupProviderPlugin.valueIn(zoneId) + "\" backup provider. Acceptable \"backup.framework.provider.plugin\" " +
+                    "values are [\"veeam\", \"dummy\"]. Refer to documentation for more details on backup providers compatibility.");
         }
     }