Slightly improved error recovery