properly(?) handle incomplete apps, see #361