favicon url no longer relative
moved error checking in proper place
Merge branch 'feature/etag' into develop