I totally agree with being more "bullet proof". I will open a new pull request in a few minutes.