Add some catch. Should correct the issue #223