Error message improved.
Error handling improved.