Better error handling for invalid arguments (currently 500 error)