Bug1080756 followup. add callback in early return