Just trying to make code little bit safer .