Oh, wait, you had changed this to log and exit. This was just a git merge error. I'll replace the code you had for this.