Merge pull request #570 from igorko/master

Fix false positive error messages from console