Improving error message
Merge branch 'UpdateLogCapabilities'