diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Revision history for iridium
 
+## 0.1.5.4  -- 2016-05-21
+
+  * Fix git branch parsing issue
+
 ## 0.1.5.3  -- 2016-04-22
 
   * Include `cabal update` invocation by default
diff --git a/iridium.cabal b/iridium.cabal
--- a/iridium.cabal
+++ b/iridium.cabal
@@ -1,5 +1,5 @@
 name:                iridium
-version:             0.1.5.3
+version:             0.1.5.4
 synopsis:            Automated Testing and Package Uploading
 license:             BSD3
 license-file:        LICENSE
@@ -75,7 +75,6 @@
     , turtle                 >=1.2.5    && <1.3
     , text                   >=1.2.2.0  && <1.3
     , containers             >=0.5.5.1  && <0.6
-    , unsafe                 >=0.0      && <0.1
     , transformers           >=0.3.0.0  && <0.5
     , system-filepath        >=0.4.13.4 && <0.5
     , unordered-containers   >=0.2.5.1  && <0.3
diff --git a/src/Development/Iridium/Repo/Git.hs b/src/Development/Iridium/Repo/Git.hs
--- a/src/Development/Iridium/Repo/Git.hs
+++ b/src/Development/Iridium/Repo/Git.hs
@@ -32,12 +32,14 @@
 instance Repo GitImpl where
   repo_retrieveInfo = do
     branchStringRaw <- runCommandStdOut "git" ["branch"]
-    case branchStringRaw of
-      ('*':' ':branchName) ->
-        return $ GitImpl $ takeWhile (`notElem` "\n\r") branchName
-      _ -> do
+    let branchNamePred ('*':' ':branchName) = Just branchName
+        branchNamePred _ = Nothing
+    case firstJust branchNamePred $ lines branchStringRaw of
+      Nothing -> do
         pushLog LogLevelError "Could not parse current git branch name."
         mzero
+      Just branchName ->
+        return $ GitImpl $ branchName
   repo_runChecks _git = withStack "[git]" $ do
     pushLog LogLevelPrint "[git]"
     withIndentation $ do
diff --git a/src/Development/Iridium/UI/Console.hs b/src/Development/Iridium/UI/Console.hs
--- a/src/Development/Iridium/UI/Console.hs
+++ b/src/Development/Iridium/UI/Console.hs
@@ -16,7 +16,6 @@
 
 
 
-import qualified System.Unsafe as Unsafe
 import           Data.IORef
 import           Control.Monad
 import           Control.Monad.IO.Class