Add worker state, put catch back around server_state