Change error message
Better copying and moving