diff --git a/lib/ipmi_client.robot b/lib/ipmi_client.robot
index e1a386b..aab95d1 100755
--- a/lib/ipmi_client.robot
+++ b/lib/ipmi_client.robot
@@ -140,6 +140,7 @@
     ...  ${HOST}${SPACE}${OPENBMC_HOST}${SPACE}sol activate
 
     Start Process  ${ipmi_cmd}  shell=True  stdout=${file_path}
+    ...  alias=sol_proc
 
 
 Deactivate SOL Via IPMI
@@ -155,7 +156,8 @@
     ...  ${HOST}${SPACE}${OPENBMC_HOST}${SPACE}sol deactivate
 
     ${rc}  ${output}=  Run and Return RC and Output  ${ipmi_cmd}
-    Run Keyword If  ${rc} > 0  Return From Keyword  ${output}
+    Run Keyword If  ${rc} > 0  Run Keywords
+    ...  Terminate Process  sol_proc  AND  Return From Keyword  ${output}
 
     ${rc}  ${output}=  Run and Return RC and Output  cat ${file_path}
     Should Be Equal  ${rc}  ${0}  msg=${output}