Return null instead of throwing exceptions and remove a lot of clutter