moved handlers validation to extension methods