Make Shutdown return error

This will be handy in feature, so that we can add a 1 second
timeout and then return failure.