#292 NPE by removing facade-mod