Errors handling simplified