added null pointer check, as Surcharge might be null
Merge pull request #151 from ngheungyu/master

added null pointer check, as Surcharge might be null