Implimenting simplifications as suggested.  Fixed comments, and re-enabled commented
block of code.  Fixed exception handling.

Change-Id: I253b770ff2222683134bf8c56ee7ba6adec99ea4
Merge "Implimenting simplifications as suggested.  Fixed comments, and re-enabled commented block of code.  Fixed exception handling."