Adding improved logic to all cases.

Now exceptions are concurrent and easily managed.