Fixing nebula issues causing Severe Client Errors

We see these often (see RT internal NC-6352 and NC-6801). These fixes will do something sane instead of throwing exceptions all the way up to the run loop.