Fix null args.app
Merge pull request #1341 from bootstraponline/master

Fix null args.app