Fixed stupid indexing bug
removed unneeded exceptions checks