Added handler for IllegalArgumentException