Add error checking and window exist specs