1.0.2 Commit

few small isset checks and constant not defined fix