App Resolver - fix NPE