Added logging to the callback action.
Added more defensive coding.
Merge branch 'feature/login-bugfix' into develop
Merge branch 'release/v0.3'