[DEBT] - remove nasty Throwable catch.