Shuffle shuffle

Somewhere near error handling I got lost in: