Exceptions in conditional editor fixed