Merge pull request #893 from Pomax/sessionfix

session fix
moved component error reporting to a single function, and caught the last edge cases