Catch more exceptions. With keyword TODO