fixed validation, extracted message to constant, pass uri in arg