Null Checks and Lint Clean Up