Fixed panic calls to be similar to others in library