Summary: The launcher will throw the Error vs. Exception, also fixed some minor issues with the tests.
Reviewed-by: darcy