more checks in order to prevent errors..