[CLEANUP] Early returns in various DataHandler methods