Added better extraction error support.