Added some comments on the code and slightly improved the error reporting formatting.
Authored by: Oscar Gustafsson 2012-11-16
Parent(s): [5d6411]
Child(ren): [71bdd0]