Also instead of ending in error, only end it in here (since we expect this to be called)