handle some more errors
add support for full path