add documentation
improve handler name
add exception handleing