Fixed java.util.ElementNotFound exception
Remember to throw exception instead of returning it!
Merge branch 'master' into scala-2.11