Don't lose original exception
Better tests