Corrected fix and better error checking for action/event request (#12056)

Change-Id: I85e8fff753baba2d0c373f235ddf74d0d2a97ed3