Fixed assertion error for incomplete code.
Buildserver auto merge