File loading was fixed and fail message was added
Fixed merge conflicts