Fix for Null Pointer
Firewall: update to 2.2.2