make more tests in situations where errors arises and manage them uniformly
make more tests in situations where errors arises and manage them uniformly