[#4186] ticket:96 Added error handling
3 files changed