Updating to catch more exceptions and attempt not to crash :)