CLSN-1239 return $q in every failure function