Added new error handling to windows variants