cleaner fix

same basic fix but catch it  in switch instead of after