Added moves exception support