A couple of error handling fixes

Blank page instead of explosion. Probably best.