update exception catch clause
refining exception handling
remove debug code
remove debug code
get the correct branch
Merge pull request #4769 from heliclei/develop

update exception catch clause