Enabled add gateway to refrain from checking exit code

Fixes bug 1129741

Change-Id: Ibb9a0e1c0f0e5ad610c4f45ae65eb82e25a57b94