Fixed with Frame class, cleaned, catching more ex.