Fix violation on returning empty result