Fixed remote exception and added unittest to show this is already fixed
Merge pull request #3035 from noctarius/github_issue_3031

Fixed remote exception and added unittest to show this is already fixed