Merge pull request #2513 from lambdageek/monoerror-RESOLVE_TYPE