Issue 2, add the exception handle process