Improves side-effect returned handling