Improving stability, catch exceptions