Made trustStoreFile-handling more robust.