Added returns statement on validation