Merge pull request #1158 from rick/i-do-not-think-this-means-what-you-think-it-means don't deref before we've asserted