Fix for session handling

closes #1978
- wait for async calls before callback()