diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/metadata/ResourceManagerMetadata.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/metadata/ResourceManagerMetadata.java
index 8971dd776e8..50cc88e4994 100644
--- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/metadata/ResourceManagerMetadata.java
+++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/metadata/ResourceManagerMetadata.java
@@ -73,6 +73,9 @@ public class ResourceManagerMetadata implements Comparable<ResourceManagerMetada
 	private final Workspace workspace;
 
 	private ResourceManagerMetadata(ResourceManager<?> mgr, Workspace workspace) {
+		if (mgr == null)
+			throw new IllegalArgumentException(
+					"ResourceManager must not be null. Check your workspace configuration for errors.");
 		this.workspace = workspace;
 		if (mgr.getMetadata() != null) {
 			for (ResourceProvider<?> provider : mgr.getProviders()) {
diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceBean.java
index be3f768688f..dca81d61568 100644
--- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceBean.java
+++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceBean.java
@@ -217,7 +217,7 @@ public String applyChanges() {
 			OGCFrontController.getInstance().reload();
 		}
 		catch (Exception e) {
-			e.printStackTrace();
+			LOG.error("Failed to reload OGCFrontController {} ", e.getMessage(), e);
 		}
 
 		modified = false;
@@ -240,6 +240,7 @@ public void downloadWorkspace() {
 			importWorkspace(location);
 		}
 		catch (Throwable t) {
+			LOG.error("Failed to download workspace {} ", t.getMessage(), t);
 			FacesMessage fm = new FacesMessage(SEVERITY_ERROR, "Unable to download workspace: " + t.getMessage(), null);
 			FacesContext.getCurrentInstance().addMessage(null, fm);
 		}
@@ -274,7 +275,7 @@ private void importWorkspace(String location) {
 			}
 		}
 		catch (Exception e) {
-			e.printStackTrace();
+			LOG.error("Failed to import workspace {} ", e.getMessage(), e);
 			FacesMessage fm = new FacesMessage(SEVERITY_ERROR, "Unable to import workspace: " + e.getMessage(), null);
 			FacesContext.getCurrentInstance().addMessage(null, fm);
 		}
@@ -363,7 +364,7 @@ public List<String> downloadWorkspaceList(String url) {
 			return res;
 		}
 		catch (Throwable t) {
-			LOG.warn("Could not get workspace list: {}.", t.getMessage());
+			LOG.error("Could not get workspace list: {}.", t.getMessage());
 			return new ArrayList<String>();
 		}
 		finally {