Check for null, #57