Removed null exception