Added exception validation