maty - Stack extend resource and removed null checks

maty - Stack extend resource and removed null checks