Fix exception when return is missing. Fixes #29