[BUGFIX] Remove Debug- and die() Statements