Fixed Exceptions
Merged changes
Merge branch 'master' of https://github.com/europeana/Europeana-Cloud.git
Merged changes