ZEN-13398 CC - Go Panic! (omg!) when starting all services at once

  - check for nil before using state*