NAWQAAN-207

With NAWQAAN-234 bonus
Please add error handling.