small adaptions at StorageHandler