some exception changes for better presentation
gh-56 gh-26