Fixing error conditions and paths.