Swap out error images
error handling tweaks