Add exception handling for query module