removing invalid error log message
Merge branch 'master' into develop