Add exception handling to RS