Fix recursive deploys with extra apps
Tweak error handling