Fixed NPE while retrieving WMS layer images
Merge branch 'master' into development