add raise and nullptr checks to new focus change code

add raise and nullptr checks to new focus change code #614