v1.5
Fix a null pointer exception