Removed NullPointerEx Catch and minor formatting changes.