Fix a potential null pointer exception
Update common