sitting page
Updates to unit and test
updated to handle new error description
Merge remote-tracking branch 'origin/master' into back-end-working
Fixed an unchecked error.