Bug fix : NullPointerException (Race-condition).