Fixed error checking for primary job and avatar