Fix handler error message
Fix buffer directory behavior