Martin Yde - Added check for arg 2