added invalid handle return when appropriate
added invalid handle return when appropriate

emilcondrea/trousers,emilcondrea/trousers,emilcondrea/trousers,Distrotech/trousers,Distrotech/trousers,Distrotech/trousers