Added null exception blocks.