add return into Handler