Added safety checks, start on dynamic Entity creation

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>