Merge "Fix NPE in WMS"