Some improvements
FOund place prone to exception + added comment