Fix the crazy stacktraces
Get rid of waitFor recursion
Merge pull request #9 from gaye/kill-waitFor-recursion

Kill wait for recursion r=lightsofapollo