Add returns in if (success) loop