fixes ZEN-15717

DO NOT MERGE
this seems extreme. Just return an error?