Ignore certain error messages
Merge branch 'dev'