Little robustness changes

Hello Mike, I made few small changes to make vranger more robust. I have a larger pull request coming, but I didn't want to scare you at first :) Thanks for a great hack!