proper handling of improper get-value

1 files changed, 7 insertions, 3 deletions

diff --git a/src/expr/command.cpp b/src/expr/command.cpp
index 47c6d1eb5..7d060186a 100644
--- a/src/expr/command.cpp
+++ b/src/expr/command.cpp
@@ -484,9 +484,13 @@ Expr GetValueCommand::getTerm() const throw() {
 }
 
 void GetValueCommand::invoke(SmtEngine* smtEngine) throw() {
-  d_result = d_term.getExprManager()->mkExpr(kind::TUPLE, d_term,
-                                             smtEngine->getValue(d_term));
-  d_commandStatus = CommandSuccess::instance();
+  try {
+    d_result = d_term.getExprManager()->mkExpr(kind::TUPLE, d_term,
+                                               smtEngine->getValue(d_term));
+    d_commandStatus = CommandSuccess::instance();
+  } catch(exception& e) {
+    d_commandStatus = new CommandFailure(e.what());
+  }
 }
 
 Expr GetValueCommand::getResult() const throw() {