Tweaking short circuit logic.

- Changing the if statement to return if data: is encountered
  instead of continuing on the function.