Fixes #663 NPE on disabled Facades
Merge pull request #664 from thatsIch/b-663-disabled-facades

Fixes #663 NPE on disabled Facades