Second cut improved the exception handling a bit