fixing method check and null artifact issue