Fix a bug uncovered by strict mode in the rt client

Change-Id: I72fe0315c35192d02089338051adf3d34d04988c