Trying to fix file upload bug

Message is trying to access private fields, so removed those calls.
SW-126
Merge branch 'fixing-upload-notification'