Fixed validators
Fixed errors handling
Updated import