added wrapper around exception and re-thrown correct exception