small simplification
hopefully better stack trace with exception