Added better error message for retrieve command