* Should work better with errors that can happen during deployment (cherry picked from commit 3d2e5667)