Merge "Return correct error codes from extractors"