diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java
index 41f5612..5749e5b 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/CreateDatasetForm.java
@@ -1072,7 +1072,7 @@ public class CreateDatasetForm extends Composite{
 	 * @return
 	 */
 	private boolean checkSelectedMetaDataProfile() {
-		return metadataProfilesFormatListbox.getSelectedItemText().equals("none");
+		return metadataProfilesFormatListbox.getSelectedItemText().equals("none") && (metadataProfilesFormatListbox.getItemCount() == 1);
 	}
 
 	/**
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
index d307585..fa1acb7 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
@@ -546,7 +546,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
 	@Override
 	public List<MetaDataProfileBean> getProfiles(String orgName) {
 
-		List<MetaDataProfileBean> toReturn = null;
+		List<MetaDataProfileBean> toReturn = new ArrayList<MetaDataProfileBean>();
 		try{
 			toReturn = Utils.getMetadataProfilesList(Utils.retrieveScopeFromOrganizationName(orgName), getThreadLocalRequest().getSession(), getASLSession(), CKAN_PROFILES_KEY);
 		}catch(Exception e){