Attempt to wait for the build to be completed before running it, and added a little bit of help as well.