diff --git a/.gitignore b/.gitignore
index 4550a19..c6adcd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
+.rebar
 .eunit
 .dialyzer_plt
 erl_crash.dump
-ebin/
+ebin
diff --git a/VERSION b/VERSION
index 6085e94..23aa839 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.1
+1.2.2
diff --git a/src/poolboy.erl b/src/poolboy.erl
index 0916319..f2ac69e 100644
--- a/src/poolboy.erl
+++ b/src/poolboy.erl
@@ -196,7 +196,6 @@ handle_call(get_all_monitors, _From, State) ->
     Monitors = ets:tab2list(State#state.monitors),
     {reply, Monitors, State};
 handle_call(stop, _From, State) ->
-    true = exit(State#state.supervisor, shutdown),
     {stop, normal, ok, State};
 handle_call(_Msg, _From, State) ->
     Reply = {error, invalid_message},
@@ -234,7 +233,8 @@ handle_info({'EXIT', Pid, _Reason}, State) ->
 handle_info(_Info, State) ->
     {noreply, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, State) ->
+    true = exit(State#state.supervisor, shutdown),
     ok.
 
 code_change(_OldVsn, State, _Extra) ->