[BUGFIX] Avoid Exception if validation fails