error handling
Merge pull request #990 from dereuromark/2.5-error-handling

error handling