Add missing args error handling
Refactor to args