MINOR CHNAGE: Exception fixed - II.