Edge firewall: improve exception handling

Improve the exception handling in the edge firewall

Partial-Bug: #1305032
Change-Id: Ib095a48dd7cb958c0c5cf5682eeb7fc93f2b55dd
Merge "Edge firewall: improve exception handling"