Revert "Attempt at fixing exception"

This reverts commit 721ee816774a518a4b561973d8cdff89c5ec71dd.