Change executor to throw exception