Trivial: Fixes the scala warning:

Scala compiler warning: 'This catches all Throwables. If this is really intended, use `case e : Throwable` to clear this warning.'

Fixed by adding 'case e: Throwable' to catch clauses that are meant to catch all Throwables and removing one instance
where the exception is caught and thrown, which is the equivelant to leaving the statement out.