Be more assertive about missing arguments to unsubscribe

Change-Id: Ic77263b8a98a5d129b7ae8566dc7d8a42e120295