removed warnings and better drop exception handling