EB-7453 - fixed updates.xml to include truststore dir for autoupdate to work
EB-6257 : Added null pointer check wherever possible in error scenario