Removed all null pointer issues.