Fix security risk 'Improper Input Validation'