diff --git a/lib/core/option.py b/lib/core/option.py
index a9760a1f1..9d1db72ac 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -325,12 +325,13 @@ def __setMetasploit():
 
         envPaths = os.environ["PATH"]
 
-        if "win" in PLATFORM:
+        if "darwin" not in PLATFORM and "win" in PLATFORM:
             envPaths = envPaths.split(";")
         else:
             envPaths = envPaths.split(":")
 
         for envPath in envPaths:
+            envPath    = envPath.replace(";", "")
             condition  = os.path.exists(os.path.normpath(envPath))
             condition &= os.path.exists(os.path.normpath("%s/msfcli" % envPath))
             condition &= os.path.exists(os.path.normpath("%s/msfconsole" % envPath))
diff --git a/lib/core/readlineng.py b/lib/core/readlineng.py
index c0861a8ed..f5b7aaa69 100644
--- a/lib/core/readlineng.py
+++ b/lib/core/readlineng.py
@@ -49,7 +49,7 @@ except ImportError:
     except ImportError:    
         haveReadline = False
 
-if 'win' in PLATFORM and haveReadline:
+if 'win' in PLATFORM and 'darwin' not in PLATFORM and haveReadline:
     try:
         _outputfile=_rl.GetOutputFile()
     except AttributeError: