This patch turns the hard assertion failure on state override
application failure into a graceful exit, that returns a message to the user.

(cherry picked from commit c5a155ccffec38a294ecdf504ebffa7e62870e21)