Fixed issues with closures that made failure fallbacks.. ehm, fail :)