Add an index check to prevent out of index

Add an index check to prevent out of index #484