Adding some error reporting which I don't think works.
Merge branch 'master' of github.com:Offlein/nyc-reg2