#146: Added validation