[UPDATE]fix out-of-border throw in error