Node v0.8 - problem on handeling errors

This seems to make tests pass in Node v0.8 too.

However, at the moment, I am not convinced this is a really safe fix.

Opinions?