Fix error message in case object.di is not found.
Merge branch 'master' into merge-2.064