Remove exception throw, workaround.