Fix null acceptance

@alex-deaconu @stevesherrie 
please review