Refactoring: cleaner code
Fix: pass handling to next strategy instead of fail! if custom strategy didn't succeed