Changed the exception to hopefully something more general