remove unnecessary custom argument
more exception handling