Make all raises ArgumentError for easier rescusing