code modernization
added an error message to an assertion
Merge remote-tracking branch 'origin/develop' into develop-patches