Final Changes for Exception Catches dealing with first test.

Signed-off-by: deathwarror <deathwarror@gmail.com>