Workaround: never return None