View improved
Error handling improved