Exceptions and null references
More tweaks