More redundant code and exception cleanup.  -  v. 0.45.

More redundant code and exception cleanup.  -  v. 0.45.