add missing validation context checks
check for identity assigment and bail early