adding /home/login handling
more error handling
Merge branch 'release/1.0.16'