Error handling improved ...