Add exception handle on NonVisible Elements + some refactoring