fixed issue where the same error triggers two different exceptions in linux and windows
fixing merge conflicts