Saftey first

by Damir Peric