Additional NULL value error handling