Seems like we could rescue and raise an nice looking error instead.