Less stupid exception handling.