diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java index 076893863af..762319884b9 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java @@ -317,8 +317,8 @@ private void msg(String s){ } public boolean isVersionDefaultCustomTerms(DatasetVersion datasetVersion) { - - if (datasetVersion.getId() != null) { + //SEK - belt and suspenders here, but this is where the bug 10719 first manifested + if (datasetVersion != null && datasetVersion.getId() != null) { try { TermsOfUseAndAccess toua = (TermsOfUseAndAccess) em.createNamedQuery("TermsOfUseAndAccess.findByDatasetVersionIdAndDefaultTerms") .setParameter("id", datasetVersion.getId()).setParameter("defaultTerms", TermsOfUseAndAccess.DEFAULT_NOTERMS).getSingleResult(); diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml index 42a4c3ec5f5..255e63fbfc2 100644 --- a/src/main/webapp/dataset-license-terms.xhtml +++ b/src/main/webapp/dataset-license-terms.xhtml @@ -44,7 +44,7 @@

- +

diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml index 280d5ed05b9..12dca612f1b 100644 --- a/src/main/webapp/template.xhtml +++ b/src/main/webapp/template.xhtml @@ -114,7 +114,7 @@

-