Checking more database calls for null.