added more catches