Merge "Return current object instead of Exception when constant state is null" into nyc-mr1-dev