Added null Check. Closes #6. Again.