Add some error checking for arg handler