Refactored a bit
Added required to Client
Added required to log message
Required validation  added