Fixes to error handling and placehold lightboxing.
Merge branch 'master' into ill