Fixes #315 error when a layer does not exist
Merge branch 'develop' (v0.37.2)