Added client image validation and update client file validator

Solves #4356 :)