diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/builders/XmlBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/builders/XmlBuilder.java
index 408bbfde8..8a2c2173c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/builders/XmlBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/builders/XmlBuilder.java
@@ -12,6 +12,7 @@ import org.xml.sax.SAXException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
@@ -47,6 +48,8 @@ public class XmlBuilder {
             StringWriter writer = new StringWriter();
             StreamResult result = new StreamResult(writer);
             DOMSource source = new DOMSource(doc);
+            trans.setOutputProperty(OutputKeys.INDENT, "yes");
+            trans.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
             trans.transform(source, result);
             return writer.toString();
         } catch (TransformerException e) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
index 9906baeb6..3e3e52b40 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
@@ -158,18 +158,18 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
 
     @Override
     public DatasetListingModel fromDataModel(Dataset entity) {
-        this.id = entity.getId().toString();
+        this.id = entity.getId() != null ? entity.getId().toString() : "";
         this.label = entity.getLabel();
         this.created = entity.getCreated();
         this.modified = entity.getModified();
-        this.grant = entity.getDmp().getGrant().getLabel();
+        this.grant = entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : "";
         this.dmp = entity.getDmp() != null ? entity.getDmp().getLabel() : "";
         this.dmpId = entity.getDmp() != null ? entity.getDmp().getId().toString() : "";
         this.profile = entity.getProfile() != null ? entity.getProfile().getLabel() : "";
         this.description = entity.getDescription();
         this.status = entity.getStatus();
-        this.grantAbbreviation = entity.getDmp().getGrant().getAbbreviation();
-        this.grantId = entity.getDmp().getGrant().getId().toString();
+        this.grantAbbreviation = entity.getDmp() != null ? entity.getDmp().getGrant().getAbbreviation() : "";
+        this.grantId = entity.getDmp() != null ? entity.getDmp().getGrant().getId().toString() : "";
         this.registries = LabelBuilder.getLabel(entity.getRegistries().stream().map(item -> new eu.eudat.models.data.dataset.Registry().fromDataModel(item)).collect(Collectors.toList()));
         this.dataRepositories = LabelBuilder.getLabel(entity.getDatasetDataRepositories().stream().map(item -> new DataRepository().fromDataModel(item.getDataRepository())).collect(Collectors.toList()));
         this.services = LabelBuilder.getLabel(entity.getServices().stream().map(item -> new Service().fromDataModel(item.getService())).collect(Collectors.toList()));