Added the error message text and additionally the fixes for OSX