Extra checks on returned data