fixes #8 Errors logic polish