Bug 413207: Fixed NPE if there is no underlying layer/dim
3 files changed