Need also to make sure error is cleared out before Execute

Change-Id: I9319a36f432472f8ad240371118183a1014a6906