LPS-37811 Remove unthrown exception
LPS-37811 regen svcs
LPS-37817 Missed NPE case