Removed weird FileSystem error firing and use deferred methods instead.