removing some exception handling...