Address 1.8.7 failures.

LocalJumpError:
       unexpected return