Add temporary workaround so mempty doesn't always call error