Excetion Handling added