Fixed java.util.ElementNotFound exception
Remember to throw exception instead of returning it!