ticket30149 142 B

123
  1. o Code simplification and refactoring:
  2. - Add several assertions in an attempt to fix some Coverity warnings.
  3. Closes ticket 30149.