Remove app shutdown and update exception handling