some tuning

exception handling