Fix for null pointer
Conflicts