Added config check to prevent crashesFixes part of #618 (commit: 2dab4b0)
Better solution to the last commitDon't even register the decorator if we aren't going to modify theworld. (commit: 47541f7)