Re #1438 Preventing null pointer exception.
Merge branch 'master' of ssh://github.com/europeana/corelib