cleaner handling of sprintly error 500.
Merge branch 'bumboarder'