Fix completion handler crash