Added fallback-option
Added small safety check to addFile()