Added statement for ... else

Statement for ... else was insert where it possible.

Change-Id: I3332e1bfff8f75c2ba862a2196c7d343530f465f
Merge "Added statement for ... else"