Finished fixing an issue where the Exceptions were causing an error to be thrown during execution.

Signed-off-by: Alfonso Martinez <corrupted.rogues@gmail.com>