Fixing error issues.