Keep orinigal runtime exception if possible (i.e. NotFoundException)