Error 2 Branch Fix

At this point, Error 2 is no worse than master, so I'm just going with a pull request.