Allow Facade and improved errors catch