Update Whoops handling
Merge pull request #2674 from denis-sokolov/update-whoops

Update Whoops handling