diff --git a/elisp/ghc-comp.el b/elisp/ghc-comp.el
index 2b26a16..2209ca2 100644
--- a/elisp/ghc-comp.el
+++ b/elisp/ghc-comp.el
@@ -127,7 +127,7 @@ unloaded modules are loaded")
   (interactive)
   (if (ghc-should-scroll)
       (ghc-scroll-completion-buffer)
-      (ghc-try-complete)))
+    (ghc-try-complete)))
 
 (defun ghc-should-scroll ()
   (let ((window (ghc-completion-window)))
diff --git a/elisp/ghc-process.el b/elisp/ghc-process.el
index 7ecfa34..b44416e 100644
--- a/elisp/ghc-process.el
+++ b/elisp/ghc-process.el
@@ -18,8 +18,7 @@
 (defvar-local ghc-process-original-buffer nil)
 (defvar-local ghc-process-original-file nil)
 (defvar-local ghc-process-callback nil)
-(defvar-local ghc-process-hook nil
-  "Hook that will be called upon successfull completion of ghc-mod command.")
+(defvar-local ghc-process-hook nil)
 
 (defvar ghc-command "ghc-mod")
 
@@ -31,28 +30,26 @@
 (defun ghc-with-process (cmd callback &optional hook1 hook2)
   (unless ghc-process-process-name
     (setq ghc-process-process-name (ghc-get-project-root)))
-  (if ghc-process-running
-    (error "ghc process already running")
-    (progn
-      (setq ghc-process-running t)
-      (if hook1 (funcall hook1))
-      (let* ((cbuf (current-buffer))
-             (name ghc-process-process-name)
-             (buf (get-buffer-create (concat " ghc-mod:" name)))
-             (file (buffer-file-name))
-             (cpro (get-process name)))
-        (ghc-with-current-buffer buf
-          (setq ghc-process-original-buffer cbuf)
-          (setq ghc-process-original-file file)
-          (setq ghc-process-callback callback)
-          (setq ghc-process-hook hook2)
-          (erase-buffer)
-          (let ((pro (ghc-get-process cpro name buf)))
-            (process-send-string pro cmd)
-            (when ghc-debug
-              (ghc-with-debug-buffer
-               (insert (format "%% %s" cmd))))
-            pro))))))
+  (when (and ghc-process-process-name (not ghc-process-running))
+    (setq ghc-process-running t)
+    (if hook1 (funcall hook1))
+    (let* ((cbuf (current-buffer))
+	   (name ghc-process-process-name)
+	   (buf (get-buffer-create (concat " ghc-mod:" name)))
+	   (file (buffer-file-name))
+	   (cpro (get-process name)))
+      (ghc-with-current-buffer buf
+        (setq ghc-process-original-buffer cbuf)
+	(setq ghc-process-original-file file)
+	(setq ghc-process-callback callback)
+	(setq ghc-process-hook hook2)
+	(erase-buffer)
+	(let ((pro (ghc-get-process cpro name buf)))
+	  (process-send-string pro cmd)
+	  (when ghc-debug
+	    (ghc-with-debug-buffer
+	     (insert (format "%% %s" cmd))))
+	  pro)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;