Indixing advanced
improved error message
Merge commit 'e551c6d3452413b88bbde46cca710c1d6e361871'