Merge changes I5c5c4eb3,I36712447,I5b78d449

* changes:
  Throw illegal argument exception when slot index is invalid
  Code clean up
  Improved debug message