Merge "Address syntax / error case nits"
am: ed6b5177e2

Change-Id: Ia67f090ccc6c22d3c2ed1e25921094c9d2de5910