Remove/add useless/required returns on errors conditions.