Fixed Stack Overflow
Fixed Mutes Null Pointer Exception