fix sitehelper and replace return by exit again