Reposition dev null checking