fixing copyright date
Merge branch 'refs/heads/topic/PLAT-6701' into topic/PLAT-6702
Added null check to args