Add validation and error fixes to get_by_number. ref #16