New build and added a check for the existance of a canvas.