Merge changes I34e6379b,I515bdbb5
authorBenny Baumann <BenBE1987@gmx.net>
Sun, 19 Mar 2017 22:56:33 +0000 (23:56 +0100)
committerGerrit Code Review <gigi-system@dogcraft.de>
Sun, 19 Mar 2017 22:56:33 +0000 (23:56 +0100)
* changes:
  udp: keep coverity happy by explicitly preventing null-returns
  upd: keep coverity happy by explicitly throwing


Trivial merge