Fixed error messaging and foldernames