Updated empty returns to return errors and put in place better error responses. Still needs work to match with registry [#Delievers 79126554]