Fixing null checking on resolveStyle