fixed some findbugs issues

Change-Id: I0712cb6f0c0e2008dc53bd9eb7468ba85fc0c234
Signed-off-by: Alexander Wert <alexander.wert@sap.com>