fix 1476 by loading layer also when server is unrecognized

fixes #1476

Work by @pmbohm. Minor fixes by @danfruehauf.