Bugfix: make "restart" command generate a correct error message in some cases.

Bugs closed: aurora-400

Reviewed at https://reviews.apache.org/r/21223/