Added handling for when form name is not set

Change-Id: I56164808c99775fb3f21c513c0090c1e4b943e8b