Moved currency check to prepareArgs