Don't assume incoming action is valid

When the incoming action is None, assume the first action in the queue is the
thing we should do.

Fixes bug DHC-2153

Change-Id: I5d9e89ddd14231b141c567e9c6e190185a144409