MAESTRO-3087 Namespace change, error improvements (raise vs lots of if's)