Merge pull request #151 from srawlins/catcherror

Return valid type from Future.catchError.