Move handlers to catch more exceptions