Corrections based on FindBugs Report / avoid double timeout