Add exception handling for move