2013-06-25 - Jonathan Morgan - bug fixes for exception handling, comment collection.