Fixed issues #137 and #138

[bjoernf73]

The following fixes issues
#137
#138

---

This change is 

[bjoernf73]

@microsoft-github-policy-service agree

[ykuijs]

This solution causes a Catch-22 issue:
It depends on the Get-PnPContext cmdlet, which means we first have to connect to SharePoint using Connect-PnPOnline before that cmdlet works. However, we need the SPO Admin URL in order to run that cmdlet and that is exactly what we are trying to find in this code.

So I think we have to go with the solution I proposed in the issue in M365DSC. I will create a new PR, which will also fix the other issue.