fix silly exception handling