Added necessary null pointer check to static initializer of Tags class
Merge branches 'master' and 'tags_fix'