properly(?) handle incomplete apps
Merge pull request #366 from nelenkov/dev

properly(?) handle incomplete apps, see #361