TAMAYA-13 Fixed first bug found by FindBugs.